diff options
Diffstat (limited to 'boost/type_traits/is_scalar.hpp')
| -rw-r--r-- | boost/type_traits/is_scalar.hpp | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/boost/type_traits/is_scalar.hpp b/boost/type_traits/is_scalar.hpp index 4af3def14c..3031440596 100644 --- a/boost/type_traits/is_scalar.hpp +++ b/boost/type_traits/is_scalar.hpp @@ -13,43 +13,15 @@ #include <boost/type_traits/is_enum.hpp> #include <boost/type_traits/is_pointer.hpp> #include <boost/type_traits/is_member_pointer.hpp> -#include <boost/type_traits/detail/ice_or.hpp> #include <boost/config.hpp> -// should be the last #include -#include <boost/type_traits/detail/bool_trait_def.hpp> - namespace boost { -namespace detail { - template <typename T> -struct is_scalar_impl -{ - BOOST_STATIC_CONSTANT(bool, value = - (::boost::type_traits::ice_or< - ::boost::is_arithmetic<T>::value, - ::boost::is_enum<T>::value, - ::boost::is_pointer<T>::value, - ::boost::is_member_pointer<T>::value - >::value)); -}; - -// these specializations are only really needed for compilers -// without partial specialization support: -template <> struct is_scalar_impl<void>{ BOOST_STATIC_CONSTANT(bool, value = false ); }; -#ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS -template <> struct is_scalar_impl<void const>{ BOOST_STATIC_CONSTANT(bool, value = false ); }; -template <> struct is_scalar_impl<void volatile>{ BOOST_STATIC_CONSTANT(bool, value = false ); }; -template <> struct is_scalar_impl<void const volatile>{ BOOST_STATIC_CONSTANT(bool, value = false ); }; -#endif - -} // namespace detail - -BOOST_TT_AUX_BOOL_TRAIT_DEF1(is_scalar,T,::boost::detail::is_scalar_impl<T>::value) +struct is_scalar + : public integral_constant<bool, ::boost::is_arithmetic<T>::value || ::boost::is_enum<T>::value || ::boost::is_pointer<T>::value || ::boost::is_member_pointer<T>::value> +{}; } // namespace boost -#include <boost/type_traits/detail/bool_trait_undef.hpp> - #endif // BOOST_TT_IS_SCALAR_HPP_INCLUDED |