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

Qualify enable_if with namespace boost

Browse Source 
Unfortunately the change from enable_if_c to enable_if in 74c9cc9680 broke a lot of other libraries' regression tests on MSVC, which complains about ambiguous symbols.
This commit is contained in:
Marcel Raad
2015-04-03 08:55:01 +02:00
parent 001fcff9b8
commit 73e4d02b00
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,7 +717,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 enable_if< ,typename boost::enable_if<
typename boost::mpl::not_< typename boost::mpl::not_<
is_integral<Functor> >::type, is_integral<Functor> >::type,
int>::type = 0 int>::type = 0
@ -730,7 +730,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 enable_if< ,typename boost::enable_if<
typename boost::mpl::not_< typename boost::mpl::not_<
is_integral<Functor> >::type, is_integral<Functor> >::type,
int>::type = 0 int>::type = 0
@ -780,7 +780,7 @@ namespace boost {
// construct. // construct.
template<typename Functor> template<typename Functor>
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
typename enable_if< typename boost::enable_if<
typename boost::mpl::not_< typename boost::mpl::not_<
is_integral<Functor> >::type, is_integral<Functor> >::type,
BOOST_FUNCTION_FUNCTION&>::type BOOST_FUNCTION_FUNCTION&>::type
@ -1068,7 +1068,7 @@ public:
template<typename Functor> template<typename Functor>
function(Functor f function(Functor f
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
,typename enable_if< ,typename boost::enable_if<
typename boost::mpl::not_< typename boost::mpl::not_<
is_integral<Functor> >::type, is_integral<Functor> >::type,
int>::type = 0 int>::type = 0
@ -1080,7 +1080,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 enable_if< ,typename boost::enable_if<
typename boost::mpl::not_< typename boost::mpl::not_<
is_integral<Functor> >::type, is_integral<Functor> >::type,
int>::type = 0 int>::type = 0
@ -1120,7 +1120,7 @@ public:
template<typename Functor> template<typename Functor>
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
typename enable_if< typename boost::enable_if<
typename boost::mpl::not_< typename boost::mpl::not_<
is_integral<Functor> >::type, is_integral<Functor> >::type,
self_type&>::type self_type&>::type