update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / atomic / detail / type_traits / conditional.hpp

diff --git a/ceph/src/boost/boost/atomic/detail/type_traits/conditional.hpp b/ceph/src/boost/boost/atomic/detail/type_traits/conditional.hpp
index 71397ab154cf1d3ecb12ebb68af8c120a9347947..6b9e896729bcb16e4ff6198fb2e062eebed4a96e 100644 (file)
--- a/ceph/src/boost/boost/atomic/detail/type_traits/conditional.hpp
+++ b/ceph/src/boost/boost/atomic/detail/type_traits/conditional.hpp
@@ -15,7 +15,7 @@
 #define BOOST_ATOMIC_DETAIL_TYPE_TRAITS_CONDITIONAL_HPP_INCLUDED_
 
 #include <boost/atomic/detail/config.hpp>
-#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_HDR_TYPE_TRAITS)
+#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_BASIC_HDR_TYPE_TRAITS)
 #include <type_traits>
 #else
 #include <boost/type_traits/conditional.hpp>
@@ -29,7 +29,7 @@ namespace boost {
 namespace atomics {
 namespace detail {
 
-#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_HDR_TYPE_TRAITS)
+#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_BASIC_HDR_TYPE_TRAITS)
 using std::conditional;
 #else
 using boost::conditional;