[Boost-commit] svn:boost r56730 - in trunk: boost/type_traits libs/type_traits/test

Subject: [Boost-commit] svn:boost r56730 - in trunk: boost/type_traits libs/type_traits/test
From: john_at_[hidden]
Date: 2009-10-12 07:00:02

Author: johnmaddock
Date: 2009-10-12 07:00:02 EDT (Mon, 12 Oct 2009)
New Revision: 56730
URL: http://svn.boost.org/trac/boost/changeset/56730

Log:
Fixes #3401.
Text files modified: 
   trunk/boost/type_traits/has_new_operator.hpp          |    47 ++++++++++++++++++++++++++++++--------- 
   trunk/libs/type_traits/test/has_operator_new_test.cpp |    11 +++++++++                               
   2 files changed, 47 insertions(+), 11 deletions(-)

Modified: trunk/boost/type_traits/has_new_operator.hpp
==============================================================================
--- trunk/boost/type_traits/has_new_operator.hpp	(original)
+++ trunk/boost/type_traits/has_new_operator.hpp	2009-10-12 07:00:02 EDT (Mon, 12 Oct 2009)
@@ -26,7 +26,7 @@
     template <typename T>
     struct has_new_operator_impl {
         template<class U>
-        static type_traits::yes_type check_sig(
+        static type_traits::yes_type check_sig1(
             U*, 
             test<
             void *(*)(std::size_t),
@@ -34,7 +34,10 @@
             >* = NULL
         );
         template<class U>
-        static type_traits::yes_type check_sig(
+        static type_traits::no_type check_sig1(...);
+
+        template<class U>
+        static type_traits::yes_type check_sig2(
             U*, 
             test<
             void *(*)(std::size_t, const std::nothrow_t&),
@@ -42,7 +45,10 @@
             >* = NULL
         );
         template<class U>
-        static type_traits::yes_type check_sig(
+        static type_traits::no_type check_sig2(...);
+
+        template<class U>
+        static type_traits::yes_type check_sig3(
             U*, 
             test<
             void *(*)(std::size_t, void*),
@@ -50,10 +56,11 @@
             >* = NULL
         );
         template<class U>
-        static type_traits::no_type check_sig(...);
+        static type_traits::no_type check_sig3(...);
+
 
         template<class U>
-        static type_traits::yes_type check_sig2(
+        static type_traits::yes_type check_sig4(
             U*, 
             test<
             void *(*)(std::size_t),
@@ -61,7 +68,10 @@
             >* = NULL
         );
         template<class U>
-        static type_traits::yes_type check_sig2(
+        static type_traits::no_type check_sig4(...);
+
+        template<class U>
+        static type_traits::yes_type check_sig5(
             U*, 
             test<
             void *(*)(std::size_t, const std::nothrow_t&),
@@ -69,7 +79,10 @@
             >* = NULL
         );
         template<class U>
-        static type_traits::yes_type check_sig2(
+        static type_traits::no_type check_sig5(...);
+
+        template<class U>
+        static type_traits::yes_type check_sig6(
             U*, 
             test<
             void *(*)(std::size_t, void*),
@@ -77,21 +90,29 @@
             >* = NULL
         );
         template<class U>
-        static type_traits::no_type check_sig2(...);
+        static type_traits::no_type check_sig6(...);
 
         // GCC2 won't even parse this template if we embed the computation
         // of s1 in the computation of value.
         #ifdef __GNUC__
-            BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(has_new_operator_impl<T>::template check_sig<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(has_new_operator_impl<T>::template check_sig1<T>(0)));
             BOOST_STATIC_CONSTANT(unsigned, s2 = sizeof(has_new_operator_impl<T>::template check_sig2<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s3 = sizeof(has_new_operator_impl<T>::template check_sig3<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s4 = sizeof(has_new_operator_impl<T>::template check_sig4<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s5 = sizeof(has_new_operator_impl<T>::template check_sig5<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s6 = sizeof(has_new_operator_impl<T>::template check_sig6<T>(0)));
         #else
             #if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000)
                 #pragma warning(push)
                 #pragma warning(disable:6334)
             #endif
 
-            BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(check_sig<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s1 = sizeof(check_sig1<T>(0)));
             BOOST_STATIC_CONSTANT(unsigned, s2 = sizeof(check_sig2<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s3 = sizeof(check_sig3<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s4 = sizeof(check_sig4<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s5 = sizeof(check_sig5<T>(0)));
+            BOOST_STATIC_CONSTANT(unsigned, s6 = sizeof(check_sig6<T>(0)));
 
             #if BOOST_WORKAROUND(BOOST_MSVC_FULL_VER, >= 140050000)
                 #pragma warning(pop)
@@ -100,7 +121,11 @@
         BOOST_STATIC_CONSTANT(bool, value = 
            (::boost::type_traits::ice_or<
             (s1 == sizeof(type_traits::yes_type)),
-            (s2 == sizeof(type_traits::yes_type))
+            (s2 == sizeof(type_traits::yes_type)),
+            (s3 == sizeof(type_traits::yes_type)),
+            (s4 == sizeof(type_traits::yes_type)),
+            (s5 == sizeof(type_traits::yes_type)),
+            (s6 == sizeof(type_traits::yes_type))
            >::value)
         );
     };

Modified: trunk/libs/type_traits/test/has_operator_new_test.cpp
==============================================================================
--- trunk/libs/type_traits/test/has_operator_new_test.cpp	(original)
+++ trunk/libs/type_traits/test/has_operator_new_test.cpp	2009-10-12 07:00:02 EDT (Mon, 12 Oct 2009)
@@ -33,6 +33,16 @@
    void* operator new[] (std::size_t size, void* ptr);
 };
 
+struct class_with_all_ops
+{
+   void * operator new(std::size_t);
+   void* operator new(std::size_t size, const std::nothrow_t&);
+   void* operator new[](std::size_t size);
+   void* operator new[](std::size_t size, const std::nothrow_t&);
+   void* operator new (std::size_t size, void* ptr);
+   void* operator new[] (std::size_t size, void* ptr);
+};
+
 TT_TEST_BEGIN(has_new_operator)
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<class_with_new_op>::value, true);
@@ -42,6 +52,7 @@
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<class_with_new_op4>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<class_with_new_op5>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<class_with_new_op6>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<class_with_all_ops>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<bool>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<bool const>::value, false);