mirror of
https://github.com/boostorg/function.git
synced 2025-07-31 21:34:27 +02:00
NULL pointers can be of any integral type, not just int (Howard Hinnant)
[SVN r19989]
This commit is contained in:
@@ -21,7 +21,7 @@
|
|||||||
# include <boost/config.hpp>
|
# include <boost/config.hpp>
|
||||||
# include <boost/function/function_base.hpp>
|
# include <boost/function/function_base.hpp>
|
||||||
# include <boost/mem_fn.hpp>
|
# include <boost/mem_fn.hpp>
|
||||||
# include <boost/type_traits/is_same.hpp>
|
# include <boost/type_traits/is_integral.hpp>
|
||||||
# include <boost/preprocessor/enum.hpp>
|
# include <boost/preprocessor/enum.hpp>
|
||||||
# include <boost/preprocessor/enum_params.hpp>
|
# include <boost/preprocessor/enum_params.hpp>
|
||||||
# include <boost/preprocessor/cat.hpp>
|
# include <boost/preprocessor/cat.hpp>
|
||||||
|
@@ -285,7 +285,7 @@ namespace boost {
|
|||||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||||
,typename detail::function::enable_if<
|
,typename detail::function::enable_if<
|
||||||
(::boost::type_traits::ice_not<
|
(::boost::type_traits::ice_not<
|
||||||
(is_same<Functor, int>::value)>::value),
|
(is_integral<Functor>::value)>::value),
|
||||||
int>::type = 0
|
int>::type = 0
|
||||||
#endif // BOOST_FUNCTION_NO_ENABLE_IF
|
#endif // BOOST_FUNCTION_NO_ENABLE_IF
|
||||||
) :
|
) :
|
||||||
@@ -338,7 +338,7 @@ namespace boost {
|
|||||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||||
typename detail::function::enable_if<
|
typename detail::function::enable_if<
|
||||||
(::boost::type_traits::ice_not<
|
(::boost::type_traits::ice_not<
|
||||||
(is_same<Functor, int>::value)>::value),
|
(is_integral<Functor>::value)>::value),
|
||||||
BOOST_FUNCTION_FUNCTION&>::type
|
BOOST_FUNCTION_FUNCTION&>::type
|
||||||
#else
|
#else
|
||||||
BOOST_FUNCTION_FUNCTION&
|
BOOST_FUNCTION_FUNCTION&
|
||||||
@@ -594,7 +594,7 @@ public:
|
|||||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||||
,typename detail::function::enable_if<
|
,typename detail::function::enable_if<
|
||||||
(::boost::type_traits::ice_not<
|
(::boost::type_traits::ice_not<
|
||||||
(is_same<Functor, int>::value)>::value),
|
(is_integral<Functor>::value)>::value),
|
||||||
int>::type = 0
|
int>::type = 0
|
||||||
#endif
|
#endif
|
||||||
) :
|
) :
|
||||||
@@ -620,7 +620,7 @@ public:
|
|||||||
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
#ifndef BOOST_FUNCTION_NO_ENABLE_IF
|
||||||
typename detail::function::enable_if<
|
typename detail::function::enable_if<
|
||||||
(::boost::type_traits::ice_not<
|
(::boost::type_traits::ice_not<
|
||||||
(is_same<Functor, int>::value)>::value),
|
(is_integral<Functor>::value)>::value),
|
||||||
self_type&>::type
|
self_type&>::type
|
||||||
#else
|
#else
|
||||||
self_type&
|
self_type&
|
||||||
|
Reference in New Issue
Block a user