src/cxx_supportlib/vendor-modified/boost/intrusive/detail/workaround.hpp in passenger-6.0.14 vs src/cxx_supportlib/vendor-modified/boost/intrusive/detail/workaround.hpp in passenger-6.0.15

- old
+ new

@@ -43,13 +43,13 @@ #if defined(BOOST_INTRUSIVE_DISABLE_FORCEINLINE) #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 #define BOOST_INTRUSIVE_FORCEINLINE BOOST_FORCEINLINE #endif