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

NULL pointers can be of any integral type, not just int (Howard Hinnant)

Browse Source 
[SVN r19989]
This commit is contained in:
Douglas Gregor
2003-09-10 04:16:17 +00:00
parent 043d0236a7
commit 66cd32b565
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/function/detail/prologue.hpp
View File

@ -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>

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

@ -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&