From dff86fad33b0157fa9c6f9d0a64befc1657fc535 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Tue, 28 Oct 2014 18:10:28 -0400
Subject: [PATCH] changed: Minor cleanup of llatomic, add support for using
std::atomic too
---
indra/llcommon/llatomic.h | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/indra/llcommon/llatomic.h b/indra/llcommon/llatomic.h
index dbf55ab544..e620e67683 100644
--- a/indra/llcommon/llatomic.h
+++ b/indra/llcommon/llatomic.h
@@ -28,19 +28,21 @@
#pragma once
#include "stdtypes.h"
+#define AL_CXX_ATOMICS 1
#define AL_BOOST_ATOMICS 1
-#if (__cplusplus >= 201103L || _MSC_VER >= 1800)
-
+#if AL_CXX_ATOMICS && (__cplusplus >= 201103L || _MSC_VER >= 1800)
#if AL_BOOST_ATOMICS
#include <boost/atomic.hpp>
-#elif AL_STD_ATOMICS
-#include <boost/atomic.hpp>
-#endif
template<typename Type>
using LLAtomic32 = boost::atomic<Type>;
+#elif AL_STD_ATOMICS
+#include <atomic>
+template<typename Type>
+using LLAtomic32 = std::atomic<Type>;
+#endif
#else
-#include "apr_atomic.h"
+#include <apr_atomic.h>
template <typename Type> class LLAtomic32
{
public:
--
GitLab