update ceph source to reef 18.1.2

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

diff --git a/ceph/src/boost/boost/intrusive/detail/workaround.hpp b/ceph/src/boost/boost/intrusive/detail/workaround.hpp
index f0cfaf2b2d576bf8e5714d9c21512b731f11bbba..40db395cbb3b213480c41f6d279dd507687c6ad8 100644 (file)
--- a/ceph/src/boost/boost/intrusive/detail/workaround.hpp
+++ b/ceph/src/boost/boost/intrusive/detail/workaround.hpp
@@ -45,10 +45,10 @@
    #define BOOST_INTRUSIVE_FORCEINLINE inline
 #elif defined(BOOST_INTRUSIVE_FORCEINLINE_IS_BOOST_FORCELINE)
    #define BOOST_INTRUSIVE_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_INTRUSIVE_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_INTRUSIVE_FORCEINLINE inline
 #else