Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/type_traits/config.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/type_traits/config.hpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/3rdParty/Boost/src/boost/type_traits/config.hpp b/3rdParty/Boost/src/boost/type_traits/config.hpp index 94f1376..2e25ad0 100644 --- a/3rdParty/Boost/src/boost/type_traits/config.hpp +++ b/3rdParty/Boost/src/boost/type_traits/config.hpp @@ -16,7 +16,7 @@ #include <boost/detail/workaround.hpp> // -// whenever we have a conversion function with elipses +// whenever we have a conversion function with ellipses // it needs to be declared __cdecl to suppress compiler // warnings from MS and Borland compilers (this *must* // appear before we include is_same.hpp below): @@ -27,8 +27,6 @@ #endif # if (BOOST_WORKAROUND(__MWERKS__, < 0x3000) \ - || BOOST_WORKAROUND(BOOST_MSVC, <= 1301) \ - || !defined(__EDG_VERSION__) && BOOST_WORKAROUND(__GNUC__, < 3) \ || BOOST_WORKAROUND(__IBMCPP__, < 600 ) \ || BOOST_WORKAROUND(__BORLANDC__, < 0x5A0) \ || defined(__ghs) \ @@ -46,14 +44,6 @@ #endif // -// Define BOOST_TT_NO_ELLIPSIS_IN_FUNC_TESTING -// when we can't test for function types with elipsis: -// -#if BOOST_WORKAROUND(__GNUC__, < 3) -# define BOOST_TT_NO_ELLIPSIS_IN_FUNC_TESTING -#endif - -// // define BOOST_TT_TEST_MS_FUNC_SIGS // when we want to test __stdcall etc function types with is_function etc // (Note, does not work with Borland, even though it does support __stdcall etc): @@ -71,6 +61,12 @@ # define BOOST_TT_NO_CV_FUNC_TEST #endif +// +// Macros that have been deprecated, defined here for backwards compatibility: +// +#define BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(x) +#define BOOST_TT_BROKEN_COMPILER_SPEC(x) + #endif // BOOST_TT_CONFIG_HPP_INCLUDED |