summaryrefslogtreecommitdiff
path: root/boost/type_traits/is_object.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/type_traits/is_object.hpp')
-rw-r--r--boost/type_traits/is_object.hpp31
1 files changed, 7 insertions, 24 deletions
diff --git a/boost/type_traits/is_object.hpp b/boost/type_traits/is_object.hpp
index 1d1ae4f02e..fc9d2f25d3 100644
--- a/boost/type_traits/is_object.hpp
+++ b/boost/type_traits/is_object.hpp
@@ -9,37 +9,20 @@
#ifndef BOOST_TT_IS_OBJECT_HPP_INCLUDED
#define BOOST_TT_IS_OBJECT_HPP_INCLUDED
+#include <boost/config.hpp>
#include <boost/type_traits/is_reference.hpp>
#include <boost/type_traits/is_void.hpp>
#include <boost/type_traits/is_function.hpp>
-#include <boost/type_traits/detail/ice_and.hpp>
-#include <boost/type_traits/detail/ice_not.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_object_impl
-{
- BOOST_STATIC_CONSTANT(bool, value =
- (::boost::type_traits::ice_and<
- ::boost::type_traits::ice_not< ::boost::is_reference<T>::value>::value,
- ::boost::type_traits::ice_not< ::boost::is_void<T>::value>::value,
- ::boost::type_traits::ice_not< ::boost::is_function<T>::value>::value
- >::value));
-};
-
-} // namespace detail
-
-BOOST_TT_AUX_BOOL_TRAIT_DEF1(is_object,T,::boost::detail::is_object_impl<T>::value)
+template <class T> struct is_object
+ : public
+ integral_constant<
+ bool,
+ ! ::boost::is_reference<T>::value && ! ::boost::is_void<T>::value && ! ::boost::is_function<T>::value >
+{};
} // namespace boost
-#include <boost/type_traits/detail/bool_trait_undef.hpp>
-
#endif // BOOST_TT_IS_OBJECT_HPP_INCLUDED