Skip to content

Commit e8d7bb5

Browse files
stefanseefeldstefanseefeld
committed
Merge pull request boostorg#23 from jzmaddock/patch-1
Stop Using type_traits details.
2 parents b207fc1 + 9742c30 commit e8d7bb5

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

‎include/boost/python/detail/msvc_typeinfo.hpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include <typeinfo>
99
#include <boost/type.hpp>
10-
#include <boost/type_traits/config.hpp>
1110

1211
//
1312
// Fix for icc's broken typeid() implementation which doesn't strip
@@ -48,8 +47,14 @@ inline typeinfo typeid_ref(type<T>*, ...)
4847
return detail::typeid_ref_1((T(*)())0);
4948
}
5049

50+
#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32))
51+
# define BOOST_PYTT_DECL __cdecl
52+
#else
53+
# define BOOST_PYTT_DECL /**/
54+
#endif
55+
5156
template< typename T > T&(* is_ref_tester1(type<T>) )(type<T>) { return 0; }
52-
inline char BOOST_TT_DECL is_ref_tester1(...) { return 0; }
57+
inline char BOOST_PYTT_DECL is_ref_tester1(...) { return 0; }
5358

5459
template <class T>
5560
inline typeinfo msvc_typeid(boost::type<T>*)

0 commit comments

Comments
 (0)