feedc0de/boost_function
1
0
Fork 0
forked from boostorg/function
Code Pull Requests Activity

Use enable_if from TypeTraits

Browse Source
This commit is contained in:
Glen Fernandes
2018-09-22 15:06:23 -04:00
parent b1fa00f3b1
commit d1ad1141f3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/function/function_base.hpp
View File

@ -30,7 +30,7 @@
#include <boost/config/workaround.hpp> #include <boost/config/workaround.hpp>
#include <boost/type_traits/alignment_of.hpp> #include <boost/type_traits/alignment_of.hpp>
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
# include "boost/utility/enable_if.hpp" #include <boost/type_traits/enable_if.hpp>
#else #else
# include "boost/mpl/bool.hpp" # include "boost/mpl/bool.hpp"
#endif #endif
@ -50,7 +50,7 @@
#endif // __ICL etc #endif // __ICL etc
# define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \ # define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
typename ::boost::enable_if_c< \ typename ::boost::enable_if_< \
!(::boost::is_integral<Functor>::value), \ !(::boost::is_integral<Functor>::value), \
Type>::type Type>::type

12
include/boost/function/function_template.hpp
View File

@ -715,7 +715,7 @@ namespace boost {
template<typename Functor> template<typename Functor>
BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
,typename boost::enable_if_c< ,typename boost::enable_if_<
!(is_integral<Functor>::value), !(is_integral<Functor>::value),
int>::type = 0 int>::type = 0
#endif // BOOST_NO_SFINAE #endif // BOOST_NO_SFINAE
@ -727,7 +727,7 @@ namespace boost {
template<typename Functor,typename Allocator> template<typename Functor,typename Allocator>
BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
,typename boost::enable_if_c< ,typename boost::enable_if_<
!(is_integral<Functor>::value), !(is_integral<Functor>::value),
int>::type = 0 int>::type = 0
#endif // BOOST_NO_SFINAE #endif // BOOST_NO_SFINAE
@ -776,7 +776,7 @@ namespace boost {
// construct. // construct.
template<typename Functor> template<typename Functor>
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
typename boost::enable_if_c< typename boost::enable_if_<
!(is_integral<Functor>::value), !(is_integral<Functor>::value),
BOOST_FUNCTION_FUNCTION&>::type BOOST_FUNCTION_FUNCTION&>::type
#else #else
@ -1066,7 +1066,7 @@ public:
template<typename Functor> template<typename Functor>
function(Functor f function(Functor f
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
,typename boost::enable_if_c< ,typename boost::enable_if_<
!(is_integral<Functor>::value), !(is_integral<Functor>::value),
int>::type = 0 int>::type = 0
#endif #endif
@ -1077,7 +1077,7 @@ public:
template<typename Functor,typename Allocator> template<typename Functor,typename Allocator>
function(Functor f, Allocator a function(Functor f, Allocator a
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
,typename boost::enable_if_c< ,typename boost::enable_if_<
!(is_integral<Functor>::value), !(is_integral<Functor>::value),
int>::type = 0 int>::type = 0
#endif #endif
@ -1116,7 +1116,7 @@ public:
template<typename Functor> template<typename Functor>
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
typename boost::enable_if_c< typename boost::enable_if_<
!(is_integral<Functor>::value), !(is_integral<Functor>::value),
self_type&>::type self_type&>::type
#else #else