From d1ad1141f3bbee094e114847fa41f34293e7547e Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Sat, 22 Sep 2018 15:06:23 -0400 Subject: [PATCH] Use enable_if from TypeTraits --- include/boost/function/function_base.hpp | 4 ++-- include/boost/function/function_template.hpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp index 3de9d39..c1dbabd 100644 --- a/include/boost/function/function_base.hpp +++ b/include/boost/function/function_base.hpp @@ -30,7 +30,7 @@ #include #include #ifndef BOOST_NO_SFINAE -# include "boost/utility/enable_if.hpp" +#include #else # include "boost/mpl/bool.hpp" #endif @@ -50,7 +50,7 @@ #endif // __ICL etc # define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \ - typename ::boost::enable_if_c< \ + typename ::boost::enable_if_< \ !(::boost::is_integral::value), \ Type>::type diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index 177b60a..2fa47a1 100644 --- a/include/boost/function/function_template.hpp +++ b/include/boost/function/function_template.hpp @@ -715,7 +715,7 @@ namespace boost { template BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f #ifndef BOOST_NO_SFINAE - ,typename boost::enable_if_c< + ,typename boost::enable_if_< !(is_integral::value), int>::type = 0 #endif // BOOST_NO_SFINAE @@ -727,7 +727,7 @@ namespace boost { template BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a #ifndef BOOST_NO_SFINAE - ,typename boost::enable_if_c< + ,typename boost::enable_if_< !(is_integral::value), int>::type = 0 #endif // BOOST_NO_SFINAE @@ -776,7 +776,7 @@ namespace boost { // construct. template #ifndef BOOST_NO_SFINAE - typename boost::enable_if_c< + typename boost::enable_if_< !(is_integral::value), BOOST_FUNCTION_FUNCTION&>::type #else @@ -1066,7 +1066,7 @@ public: template function(Functor f #ifndef BOOST_NO_SFINAE - ,typename boost::enable_if_c< + ,typename boost::enable_if_< !(is_integral::value), int>::type = 0 #endif @@ -1077,7 +1077,7 @@ public: template function(Functor f, Allocator a #ifndef BOOST_NO_SFINAE - ,typename boost::enable_if_c< + ,typename boost::enable_if_< !(is_integral::value), int>::type = 0 #endif @@ -1116,7 +1116,7 @@ public: template #ifndef BOOST_NO_SFINAE - typename boost::enable_if_c< + typename boost::enable_if_< !(is_integral::value), self_type&>::type #else