update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / math / tools / atomic.hpp

diff --git a/ceph/src/boost/boost/math/tools/atomic.hpp b/ceph/src/boost/boost/math/tools/atomic.hpp
index d2b8022c69c91e61ad68183dc0d0e3030daa62b2..e3cbf5db89d1dab7ea3cac4e038669bb089965fb 100644 (file)
--- a/ceph/src/boost/boost/math/tools/atomic.hpp
+++ b/ceph/src/boost/boost/math/tools/atomic.hpp
@@ -7,88 +7,44 @@
 #ifndef BOOST_MATH_ATOMIC_DETAIL_HPP
 #define BOOST_MATH_ATOMIC_DETAIL_HPP
 
-#include <boost/config.hpp>
+#include <boost/math/tools/config.hpp>
 #include <boost/math/tools/cxx03_warn.hpp>
 
 #ifdef BOOST_HAS_THREADS
+#include <atomic>
 
-#ifndef BOOST_NO_CXX11_HDR_ATOMIC
-#  include <atomic>
-#  define BOOST_MATH_ATOMIC_NS std
 namespace boost {
    namespace math {
       namespace detail {
-#if ATOMIC_INT_LOCK_FREE == 2
+#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
          typedef std::atomic<int> atomic_counter_type;
          typedef std::atomic<unsigned> atomic_unsigned_type;
          typedef int atomic_integer_type;
          typedef unsigned atomic_unsigned_integer_type;
-#elif ATOMIC_SHORT_LOCK_FREE == 2
+#elif (ATOMIC_SHORT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
          typedef std::atomic<short> atomic_counter_type;
          typedef std::atomic<unsigned short> atomic_unsigned_type;
          typedef short atomic_integer_type;
          typedef unsigned short atomic_unsigned_type;
-#elif ATOMIC_LONG_LOCK_FREE == 2
+#elif (ATOMIC_LONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
          typedef std::atomic<long> atomic_unsigned_integer_type;
          typedef std::atomic<unsigned long> atomic_unsigned_type;
          typedef unsigned long atomic_unsigned_type;
          typedef long atomic_integer_type;
-#elif ATOMIC_LLONG_LOCK_FREE == 2
+#elif (ATOMIC_LLONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT)
          typedef std::atomic<long long> atomic_unsigned_integer_type;
          typedef std::atomic<unsigned long long> atomic_unsigned_type;
          typedef long long atomic_integer_type;
          typedef unsigned long long atomic_unsigned_integer_type;
-#else
+#elif !defined(BOOST_MATH_NO_ATOMIC_INT)
 #  define BOOST_MATH_NO_ATOMIC_INT
 #endif
-      }
-   }}
-#else // BOOST_NO_CXX11_HDR_ATOMIC
-//
-// We need Boost.Atomic, but on any platform that supports auto-linking we do
-// not need to link against a separate library:
-//
-#define BOOST_ATOMIC_NO_LIB
-#include <boost/atomic.hpp>
-#  define BOOST_MATH_ATOMIC_NS boost
-
-namespace boost{ namespace math{ namespace detail{
+      } // Namespace detail
+   } // Namespace math
+} // Namespace boost
 
-//
-// We need a type to use as an atomic counter:
-//
-#if BOOST_ATOMIC_INT_LOCK_FREE == 2
-typedef boost::atomic<int> atomic_counter_type;
-typedef boost::atomic<unsigned> atomic_unsigned_type;
-typedef int atomic_integer_type;
-typedef unsigned atomic_unsigned_integer_type;
-#elif BOOST_ATOMIC_SHORT_LOCK_FREE == 2
-typedef boost::atomic<short> atomic_counter_type;
-typedef boost::atomic<unsigned short> atomic_unsigned_type;
-typedef short atomic_integer_type;
-typedef unsigned short atomic_unsigned_integer_type;
-#elif BOOST_ATOMIC_LONG_LOCK_FREE == 2
-typedef boost::atomic<long> atomic_counter_type;
-typedef boost::atomic<unsigned long> atomic_unsigned_type;
-typedef long atomic_integer_type;
-typedef unsigned long atomic_unsigned_integer_type;
-#elif BOOST_ATOMIC_LLONG_LOCK_FREE == 2
-typedef boost::atomic<long long> atomic_counter_type;
-typedef boost::atomic<unsigned long long> atomic_unsigned_type;
-typedef long long atomic_integer_type;
-typedef unsigned long long atomic_unsigned_integer_type;
 #else
 #  define BOOST_MATH_NO_ATOMIC_INT
-#endif
-
-}}} // namespaces
-
-#endif  // BOOST_NO_CXX11_HDR_ATOMIC
-
-#else // BOOST_HAS_THREADS
-
-#  define BOOST_MATH_NO_ATOMIC_INT
-
 #endif // BOOST_HAS_THREADS
 
 #endif // BOOST_MATH_ATOMIC_DETAIL_HPP