From 26e800a52fecf1dd5e08f7184a6bbfd6c5fb797d Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Thu, 21 May 2015 19:08:40 +0100 Subject: [PATCH] Stop Using type_traits details. Some of the type_traits internal details this header depends on will either go away or be moved. Either way, best not to rely on another libraries internal details. In the short term the old code will work but will generate a ton of warnings about using a deprecated header. --- include/boost/function_types/detail/classifier.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/boost/function_types/detail/classifier.hpp b/include/boost/function_types/detail/classifier.hpp index 03f3419..b5c5e71 100644 --- a/include/boost/function_types/detail/classifier.hpp +++ b/include/boost/function_types/detail/classifier.hpp @@ -11,7 +11,6 @@ #include #include -#include #include #include @@ -31,7 +30,13 @@ template struct encode_charr >::type type; }; -char BOOST_TT_DECL classifier_impl(...); +#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32)) +# define BOOST_FT_DECL __cdecl +#else +# define BOOST_FT_DECL /**/ +#endif + +char BOOST_FT_DECL classifier_impl(...); #define BOOST_FT_variations BOOST_FT_function|BOOST_FT_pointer|\ BOOST_FT_member_pointer