Rerun extract.sh to get rid of more boost

[features.git] / 3rdparty / boost / boost / type_traits / has_less.hpp

diff --git a/3rdparty/boost/boost/type_traits/has_less.hpp b/3rdparty/boost/boost/type_traits/has_less.hpp
index e1a045e592d7a049677c44fcc30b77a04ab372f2..0eefcd22ddcc4973234b12cacf82d97b7040eeb5 100644 (file)
--- a/3rdparty/boost/boost/type_traits/has_less.hpp
+++ b/3rdparty/boost/boost/type_traits/has_less.hpp
@@ -12,32 +12,32 @@
 #define BOOST_TT_TRAIT_NAME has_less
 #define BOOST_TT_TRAIT_OP <
 #define BOOST_TT_FORBIDDEN_IF\
-   ::boost::type_traits::ice_or<\
+   (\
       /* Lhs==pointer and Rhs==fundamental */\
-      ::boost::type_traits::ice_and<\
-         ::boost::is_pointer< Lhs_noref >::value,\
+      (\
+         ::boost::is_pointer< Lhs_noref >::value && \
          ::boost::is_fundamental< Rhs_nocv >::value\
-      >::value,\
+      ) || \
       /* Rhs==pointer and Lhs==fundamental */\
-      ::boost::type_traits::ice_and<\
-         ::boost::is_pointer< Rhs_noref >::value,\
+      (\
+         ::boost::is_pointer< Rhs_noref >::value && \
          ::boost::is_fundamental< Lhs_nocv >::value\
-      >::value,\
+      ) || \
       /* Lhs==pointer and Rhs==pointer and Lhs!=base(Rhs) and Rhs!=base(Lhs) and Lhs!=void* and Rhs!=void* */\
-      ::boost::type_traits::ice_and<\
-         ::boost::is_pointer< Lhs_noref >::value,\
-         ::boost::is_pointer< Rhs_noref >::value,\
-         ::boost::type_traits::ice_not<\
-            ::boost::type_traits::ice_or<\
-               ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value,\
-               ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value,\
-               ::boost::is_same< Lhs_noptr, Rhs_noptr >::value,\
-               ::boost::is_void< Lhs_noptr >::value,\
+      (\
+         ::boost::is_pointer< Lhs_noref >::value && \
+         ::boost::is_pointer< Rhs_noref >::value && \
+         (! \
+            ( \
+               ::boost::is_base_of< Lhs_noptr, Rhs_noptr >::value || \
+               ::boost::is_base_of< Rhs_noptr, Lhs_noptr >::value || \
+               ::boost::is_same< Lhs_noptr, Rhs_noptr >::value || \
+               ::boost::is_void< Lhs_noptr >::value || \
                ::boost::is_void< Rhs_noptr >::value\
-            >::value\
-         >::value\
-      >::value\
-   >::value
+            )\
+         )\
+      )\
+      )
 
 
 #include <boost/type_traits/detail/has_binary_operator.hpp>