Use ! operator directly rather than boost::mpl::not with Boost supported compilers.

This commit is contained in:
Edward Diener
2015-04-27 04:15:31 -04:00
parent fde855afb0
commit f0ec326eb0
2 changed files with 16 additions and 23 deletions

View File

@ -27,7 +27,6 @@
#include <boost/type_traits/composite_traits.hpp>
#include <boost/ref.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/not.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/type_traits/alignment_of.hpp>
#ifndef BOOST_NO_SFINAE
@ -74,15 +73,15 @@
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x5A0)
# define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
typename ::boost::enable_if<typename ::boost::mpl::not_< \
::boost::is_integral<Functor> >::type, \
typename ::boost::enable_if_c< \
!(::boost::is_integral<Functor>::value), \
Type>::type
#else
// BCC doesn't recognize this depends on a template argument and complains
// about the use of 'typename'
# define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
::boost::enable_if<::boost::mpl::not_< \
::boost::is_integral<Functor> >::type, \
::boost::enable_if_c< \
!(::boost::is_integral<Functor>::value), \
Type>::type
#endif