diff options
Diffstat (limited to 'boost/fusion/functional/invocation/detail/that_ptr.hpp')
| -rw-r--r-- | boost/fusion/functional/invocation/detail/that_ptr.hpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/boost/fusion/functional/invocation/detail/that_ptr.hpp b/boost/fusion/functional/invocation/detail/that_ptr.hpp index 7a1a5c5700..33ee93bf38 100644 --- a/boost/fusion/functional/invocation/detail/that_ptr.hpp +++ b/boost/fusion/functional/invocation/detail/that_ptr.hpp @@ -12,7 +12,6 @@ #include <boost/fusion/support/config.hpp> #include <boost/get_pointer.hpp> #include <boost/utility/addressof.hpp> -#include <boost/type_traits/config.hpp> #include <boost/type_traits/remove_reference.hpp> namespace boost { namespace fusion { namespace detail @@ -61,10 +60,16 @@ namespace boost { namespace fusion { namespace detail template <typename PtrOrSmartPtr> struct non_const_pointee; - namespace adl_barrier +#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32)) +# define BOOST_FUSION_TRAIT_DECL __cdecl +#else +# define BOOST_FUSION_TRAIT_DECL /**/ +#endif + +namespace adl_barrier { using boost::get_pointer; - void const * BOOST_TT_DECL get_pointer(...); // fallback + void const * BOOST_FUSION_TRAIT_DECL get_pointer(...); // fallback template< typename T> char const_tester(T *); template< typename T> long const_tester(T const *); |