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

Remove dependency on deprecated type_traits headers.

Browse Source
This commit is contained in:
Edward Diener
2015-03-30 01:47:08 -04:00
parent 854f2e8d5d
commit 74c9cc9680
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,9 +717,9 @@ namespace boost {
template<typename Functor>
BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f
#ifndef BOOST_NO_SFINAE
,typename enable_if_c<
(boost::type_traits::ice_not<
(is_integral<Functor>::value)>::value),
,typename enable_if<
typename boost::mpl::not_<
is_integral<Functor> >::type,
int>::type = 0
#endif // BOOST_NO_SFINAE
) :
@ -730,9 +730,9 @@ namespace boost {
template<typename Functor,typename Allocator>
BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a
#ifndef BOOST_NO_SFINAE
,typename enable_if_c<
(boost::type_traits::ice_not<
(is_integral<Functor>::value)>::value),
,typename enable_if<
typename boost::mpl::not_<
is_integral<Functor> >::type,
int>::type = 0
#endif // BOOST_NO_SFINAE
) :
@ -780,9 +780,9 @@ namespace boost {
// construct.
template<typename Functor>
#ifndef BOOST_NO_SFINAE
typename enable_if_c<
(boost::type_traits::ice_not<
(is_integral<Functor>::value)>::value),
typename enable_if<
typename boost::mpl::not_<
is_integral<Functor> >::type,
BOOST_FUNCTION_FUNCTION&>::type
#else
BOOST_FUNCTION_FUNCTION&
@ -1068,9 +1068,9 @@ public:
template<typename Functor>
function(Functor f
#ifndef BOOST_NO_SFINAE
,typename enable_if_c<
(boost::type_traits::ice_not<
(is_integral<Functor>::value)>::value),
,typename enable_if<
typename boost::mpl::not_<
is_integral<Functor> >::type,
int>::type = 0
#endif
) :
@ -1080,9 +1080,9 @@ public:
template<typename Functor,typename Allocator>
function(Functor f, Allocator a
#ifndef BOOST_NO_SFINAE
,typename enable_if_c<
(boost::type_traits::ice_not<
(is_integral<Functor>::value)>::value),
,typename enable_if<
typename boost::mpl::not_<
is_integral<Functor> >::type,
int>::type = 0
#endif
) :
@ -1120,9 +1120,9 @@ public:
template<typename Functor>
#ifndef BOOST_NO_SFINAE
typename enable_if_c<
(boost::type_traits::ice_not<
(is_integral<Functor>::value)>::value),
typename enable_if<
typename boost::mpl::not_<
is_integral<Functor> >::type,
self_type&>::type
#else
self_type&