diff DEPENDENCIES/generic/include/boost/atomic/detail/platform.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

--- a/DEPENDENCIES/generic/include/boost/atomic/detail/platform.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/atomic/detail/platform.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -1,13 +1,19 @@
-#ifndef BOOST_ATOMIC_DETAIL_PLATFORM_HPP
-#define BOOST_ATOMIC_DETAIL_PLATFORM_HPP
+/*
+ * Distributed under the Boost Software License, Version 1.0.
+ * (See accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ *
+ * Copyright (c) 2009 Helge Bahmann
+ * Copyright (c) 2014 Andrey Semashev
+ */
+/*!
+ * \file   atomic/detail/platform.hpp
+ *
+ * This header defines macros for the target platform detection
+ */
 
-//  Copyright (c) 2009 Helge Bahmann
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-
-// Platform selection file
+#ifndef BOOST_ATOMIC_DETAIL_PLATFORM_HPP_INCLUDED_
+#define BOOST_ATOMIC_DETAIL_PLATFORM_HPP_INCLUDED_
 
 #include <boost/atomic/detail/config.hpp>
 
@@ -15,57 +21,95 @@
 #pragma once
 #endif
 
-// Intel compiler does not support __atomic* intrinsics properly, although defines them (tested with 13.0.1 and 13.1.1 on Linux)
-#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(BOOST_INTEL_CXX_VERSION))\
-    || (defined(BOOST_CLANG) && ((__clang_major__ * 100 + __clang_minor__) >= 302))
+#if !defined(BOOST_ATOMIC_FORCE_FALLBACK)
 
-    #include <boost/atomic/detail/gcc-atomic.hpp>
+// Compiler-based backends
+#if ((defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407)) ||\
+    (defined(BOOST_CLANG) && ((__clang_major__ * 100 + __clang_minor__) >= 302))) &&\
+    (\
+        (__GCC_ATOMIC_BOOL_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_CHAR_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_SHORT_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_INT_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_LONG_LOCK_FREE + 0) == 2 ||\
+        (__GCC_ATOMIC_LLONG_LOCK_FREE + 0) == 2\
+    )
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_atomic
 
 #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
 
-    #include <boost/atomic/detail/gcc-x86.hpp>
-
-#elif 0 && defined(__GNUC__) && defined(__alpha__) /* currently does not work correctly */
-
-    #include <boost/atomic/detail/base.hpp>
-    #include <boost/atomic/detail/gcc-alpha.hpp>
+#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_x86
 
 #elif defined(__GNUC__) && (defined(__POWERPC__) || defined(__PPC__))
 
-    #include <boost/atomic/detail/gcc-ppc.hpp>
+#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_ppc
 
 // This list of ARM architecture versions comes from Apple's arm/arch.h header.
 // I don't know how complete it is.
-#elif defined(__GNUC__) && (defined(__ARM_ARCH_6__)  || defined(__ARM_ARCH_6J__) \
-                         || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
-                         || defined(__ARM_ARCH_6K__) \
-                         || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-                         || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
-                         || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7S__))
+#elif defined(__GNUC__) &&\
+    (\
+        defined(__ARM_ARCH_6__)  || defined(__ARM_ARCH_6J__) ||\
+        defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) ||\
+        defined(__ARM_ARCH_6ZK__) ||\
+        defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||\
+        defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) ||\
+        defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7S__)\
+    )
 
-    #include <boost/atomic/detail/gcc-armv6plus.hpp>
-
-#elif defined(__linux__) && defined(__arm__)
-
-    #include <boost/atomic/detail/linux-arm.hpp>
+#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_arm
 
 #elif defined(__GNUC__) && defined(__sparc_v9__)
 
-    #include <boost/atomic/detail/gcc-sparcv9.hpp>
+#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_sparc
+
+#elif defined(__GNUC__) && defined(__alpha__)
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_alpha
+
+#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 401) &&\
+    (\
+        defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1) ||\
+        defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) ||\
+        defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) ||\
+        defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) ||\
+        defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_16)\
+    )
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_sync
+
+#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM msvc_x86
+
+#elif defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM msvc_arm
+
+#endif
+
+// OS-based backends
+#if !defined(BOOST_ATOMIC_DETAIL_PLATFORM)
+
+#if defined(__linux__) && defined(__arm__)
+
+#define BOOST_ATOMIC_DETAIL_PLATFORM linux_arm
 
 #elif defined(BOOST_WINDOWS) || defined(_WIN32_CE)
 
-    #include <boost/atomic/detail/windows.hpp>
-
-#elif 0 && defined(__GNUC__) /* currently does not work correctly */
-
-    #include <boost/atomic/detail/base.hpp>
-    #include <boost/atomic/detail/gcc-cas.hpp>
-
-#else
-
-#include <boost/atomic/detail/base.hpp>
+#define BOOST_ATOMIC_DETAIL_PLATFORM windows
 
 #endif
 
+#endif // !defined(BOOST_ATOMIC_DETAIL_PLATFORM)
+
+#endif // !defined(BOOST_ATOMIC_FORCE_FALLBACK)
+
+#if !defined(BOOST_ATOMIC_DETAIL_PLATFORM)
+#define BOOST_ATOMIC_DETAIL_PLATFORM emulated
+#define BOOST_ATOMIC_EMULATED
 #endif
+
+#define BOOST_ATOMIC_DETAIL_HEADER(prefix) <BOOST_JOIN(prefix, BOOST_ATOMIC_DETAIL_PLATFORM).hpp>
+
+#endif // BOOST_ATOMIC_DETAIL_PLATFORM_HPP_INCLUDED_