import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / atomic / detail / extra_ops_generic.hpp

diff --git a/ceph/src/boost/boost/atomic/detail/extra_ops_generic.hpp b/ceph/src/boost/boost/atomic/detail/extra_ops_generic.hpp
index 30d4c8fb5fa086fe01ef2d01bd7278cb5f59f2b9..815b04c4bc3c5ea6eb6197da823f086a6255499b 100644 (file)
--- a/ceph/src/boost/boost/atomic/detail/extra_ops_generic.hpp
+++ b/ceph/src/boost/boost/atomic/detail/extra_ops_generic.hpp
@@ -20,25 +20,19 @@
 #include <boost/atomic/detail/storage_traits.hpp>
 #include <boost/atomic/detail/integral_conversions.hpp>
 #include <boost/atomic/detail/extra_operations_fwd.hpp>
-#include <boost/atomic/capabilities.hpp>
+#include <boost/atomic/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-// unary minus operator applied to unsigned type, result still unsigned
-#pragma warning(disable: 4146)
-#endif
-
 namespace boost {
 namespace atomics {
 namespace detail {
 
 //! Generic implementation of extra operations
 template< typename Base, std::size_t Size, bool Signed, bool = Base::full_cas_based >
-struct generic_extra_operations :
+struct extra_operations_generic :
     public Base
 {
     typedef Base base_type;
@@ -195,7 +189,7 @@ struct generic_extra_operations :
 
 //! Specialization for cases when the platform only natively supports CAS
 template< typename Base, std::size_t Size, bool Signed >
-struct generic_extra_operations< Base, Size, Signed, true > :
+struct extra_operations_generic< Base, Size, Signed, true > :
     public Base
 {
     typedef Base base_type;
@@ -387,7 +381,7 @@ struct generic_extra_operations< Base, Size, Signed, true > :
 // Default extra_operations template definition will be used unless specialized for a specific platform
 template< typename Base, std::size_t Size, bool Signed >
 struct extra_operations< Base, Size, Signed, true > :
-    public generic_extra_operations< Base, Size, Signed >
+    public extra_operations_generic< Base, Size, Signed >
 {
 };
 
@@ -395,8 +389,6 @@ struct extra_operations< Base, Size, Signed, true > :
 } // namespace atomics
 } // namespace boost
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
+#include <boost/atomic/detail/footer.hpp>
 
 #endif // BOOST_ATOMIC_DETAIL_EXTRA_OPS_GENERIC_HPP_INCLUDED_