From 9742c30f47a12d7eeeb8ac910acd100aa0e03eb6 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Thu, 21 May 2015 19:20:31 +0100 Subject: [PATCH] Stop Using type_traits details. The type_traits internal details used here are being moved to make it clear they are details and subject to change. Old code will continue to work, but will warn about use of a deprecated header. --- include/boost/python/detail/msvc_typeinfo.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/boost/python/detail/msvc_typeinfo.hpp b/include/boost/python/detail/msvc_typeinfo.hpp index d8fec4b9..bfc84164 100644 --- a/include/boost/python/detail/msvc_typeinfo.hpp +++ b/include/boost/python/detail/msvc_typeinfo.hpp @@ -7,7 +7,6 @@ #include #include -#include // // Fix for icc's broken typeid() implementation which doesn't strip @@ -48,8 +47,14 @@ inline typeinfo typeid_ref(type*, ...) return detail::typeid_ref_1((T(*)())0); } +#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32)) +# define BOOST_PYTT_DECL __cdecl +#else +# define BOOST_PYTT_DECL /**/ +#endif + template< typename T > T&(* is_ref_tester1(type) )(type) { return 0; } -inline char BOOST_TT_DECL is_ref_tester1(...) { return 0; } +inline char BOOST_PYTT_DECL is_ref_tester1(...) { return 0; } template inline typeinfo msvc_typeid(boost::type*)