From 6c8690e6c91f0148535bae0b44b9783e97a6f7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sun, 1 Jan 2012 19:14:12 +0000 Subject: [PATCH] Fixes from trunk for 1.49 [SVN r76264] --- .../intrusive/detail/has_member_function_callable_with.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/boost/intrusive/detail/has_member_function_callable_with.hpp b/include/boost/intrusive/detail/has_member_function_callable_with.hpp index d34e73f..33811e3 100644 --- a/include/boost/intrusive/detail/has_member_function_callable_with.hpp +++ b/include/boost/intrusive/detail/has_member_function_callable_with.hpp @@ -25,6 +25,8 @@ //wrong SFINAE for GCC 4.2/4.3 #if defined(__GNUC__) && !defined(__clang__) && ((__GNUC__*100 + __GNUC_MINOR__*10) >= 340) && ((__GNUC__*100 + __GNUC_MINOR__*10) <= 430) #define BOOST_INTRUSIVE_DETAIL_HAS_MEMBER_FUNCTION_CALLABLE_WITH_0_ARGS_UNSUPPORTED + #elif defined(BOOST_INTEL) && (BOOST_INTEL < 1200 ) + #define BOOST_INTRUSIVE_DETAIL_HAS_MEMBER_FUNCTION_CALLABLE_WITH_0_ARGS_UNSUPPORTED #endif namespace boost_intrusive_has_member_function_callable_with { @@ -125,6 +127,7 @@ }; #else + //Special case for 0 args template< class F , std::size_t N =