forked from boostorg/function
NULL pointers can be of any integral type, not just int (Howard Hinnant)
[SVN r19989]
This commit is contained in:
@ -285,7 +285,7 @@ namespace boost {
|
||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||
,typename detail::function::enable_if<
|
||||
(::boost::type_traits::ice_not<
|
||||
(is_same<Functor, int>::value)>::value),
|
||||
(is_integral<Functor>::value)>::value),
|
||||
int>::type = 0
|
||||
#endif // BOOST_FUNCTION_NO_ENABLE_IF
|
||||
) :
|
||||
@ -338,7 +338,7 @@ namespace boost {
|
||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||
typename detail::function::enable_if<
|
||||
(::boost::type_traits::ice_not<
|
||||
(is_same<Functor, int>::value)>::value),
|
||||
(is_integral<Functor>::value)>::value),
|
||||
BOOST_FUNCTION_FUNCTION&>::type
|
||||
#else
|
||||
BOOST_FUNCTION_FUNCTION&
|
||||
@ -594,7 +594,7 @@ public:
|
||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||
,typename detail::function::enable_if<
|
||||
(::boost::type_traits::ice_not<
|
||||
(is_same<Functor, int>::value)>::value),
|
||||
(is_integral<Functor>::value)>::value),
|
||||
int>::type = 0
|
||||
#endif
|
||||
) :
|
||||
@ -620,7 +620,7 @@ public:
|
||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||
typename detail::function::enable_if<
|
||||
(::boost::type_traits::ice_not<
|
||||
(is_same<Functor, int>::value)>::value),
|
||||
(is_integral<Functor>::value)>::value),
|
||||
self_type&>::type
|
||||
#else
|
||||
self_type&
|
||||
|
Reference in New Issue
Block a user