From 73e4d02b00ed165988478bf958ad72c46ec70837 Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Fri, 3 Apr 2015 08:55:01 +0200 Subject: [PATCH] Qualify enable_if with namespace boost Unfortunately the change from enable_if_c to enable_if in 74c9cc968086e25b6b63342528dd8f3e7f13fa2d broke a lot of other libraries' regression tests on MSVC, which complains about ambiguous symbols. --- include/boost/function/function_template.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index 3d5fdab..8aa1579 100644 --- a/include/boost/function/function_template.hpp +++ b/include/boost/function/function_template.hpp @@ -717,7 +717,7 @@ namespace boost { template BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f #ifndef BOOST_NO_SFINAE - ,typename enable_if< + ,typename boost::enable_if< typename boost::mpl::not_< is_integral >::type, int>::type = 0 @@ -730,7 +730,7 @@ namespace boost { template BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a #ifndef BOOST_NO_SFINAE - ,typename enable_if< + ,typename boost::enable_if< typename boost::mpl::not_< is_integral >::type, int>::type = 0 @@ -780,7 +780,7 @@ namespace boost { // construct. template #ifndef BOOST_NO_SFINAE - typename enable_if< + typename boost::enable_if< typename boost::mpl::not_< is_integral >::type, BOOST_FUNCTION_FUNCTION&>::type @@ -1068,7 +1068,7 @@ public: template function(Functor f #ifndef BOOST_NO_SFINAE - ,typename enable_if< + ,typename boost::enable_if< typename boost::mpl::not_< is_integral >::type, int>::type = 0 @@ -1080,7 +1080,7 @@ public: template function(Functor f, Allocator a #ifndef BOOST_NO_SFINAE - ,typename enable_if< + ,typename boost::enable_if< typename boost::mpl::not_< is_integral >::type, int>::type = 0 @@ -1120,7 +1120,7 @@ public: template #ifndef BOOST_NO_SFINAE - typename enable_if< + typename boost::enable_if< typename boost::mpl::not_< is_integral >::type, self_type&>::type