update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / move / detail / workaround.hpp

diff --git a/ceph/src/boost/boost/move/detail/workaround.hpp b/ceph/src/boost/boost/move/detail/workaround.hpp
index 1d16f2433210aee64d1b47ebd088a237643b85b3..77e01148e8f683f2d44799fadee6f453f5a20369 100644 (file)
--- a/ceph/src/boost/boost/move/detail/workaround.hpp
+++ b/ceph/src/boost/boost/move/detail/workaround.hpp
@@ -52,14 +52,16 @@
    #define BOOST_MOVE_MSVC_AUTO_MOVE_RETURN_BUG
 #endif
 
+//#define BOOST_MOVE_DISABLE_FORCEINLINE
+
 #if defined(BOOST_MOVE_DISABLE_FORCEINLINE)
    #define BOOST_MOVE_FORCEINLINE inline
 #elif defined(BOOST_MOVE_FORCEINLINE_IS_BOOST_FORCELINE)
    #define BOOST_MOVE_FORCEINLINE BOOST_FORCEINLINE
-#elif defined(BOOST_MSVC) && defined(_DEBUG)
-   //"__forceinline" and MSVC seems to have some bugs in debug mode
+#elif defined(BOOST_MSVC) && (_MSC_VER < 1900 || defined(_DEBUG))
+   //"__forceinline" and MSVC seems to have some bugs in old versions and in debug mode
    #define BOOST_MOVE_FORCEINLINE inline
-#elif defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ < 5)))
+#elif defined(BOOST_GCC) && (__GNUC__ <= 5)
    //Older GCCs have problems with forceinline
    #define BOOST_MOVE_FORCEINLINE inline
 #else