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

From: john_at_[hidden]
Date: 2007-10-22 13:48:52

Author: johnmaddock
Date: 2007-10-22 13:48:51 EDT (Mon, 22 Oct 2007)
New Revision: 40294
URL: http://svn.boost.org/trac/boost/changeset/40294

Log:
Disabled intrinsic type traits testing for SGI compiler.
Disabled one is_convertible test for aCC on PA RISC.
Disabled some tests in promote_basic_test.cpp for more platforms that have broken WCHAR_MAX macros.
Text files modified: 
   trunk/libs/type_traits/test/is_class_test.cpp       |     2 +-                                      
   trunk/libs/type_traits/test/is_convertible_test.cpp |     6 +++++-                                  
   trunk/libs/type_traits/test/is_union_test.cpp       |     2 +-                                      
   trunk/libs/type_traits/test/promote_basic_test.cpp  |     7 ++++++-                                 
   4 files changed, 13 insertions(+), 4 deletions(-)

Modified: trunk/libs/type_traits/test/is_class_test.cpp
==============================================================================
--- trunk/libs/type_traits/test/is_class_test.cpp	(original)
+++ trunk/libs/type_traits/test/is_class_test.cpp	2007-10-22 13:48:51 EDT (Mon, 22 Oct 2007)
@@ -27,7 +27,7 @@
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<f1>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<enum_UDT>::value, false);
 
-#ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS
+#if defined(BOOST_HAS_TYPE_TRAITS_INTRINSICS) && !defined(__sgi)
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<union_UDT>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<POD_union_UDT>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<empty_union_UDT>::value, false);

Modified: trunk/libs/type_traits/test/is_convertible_test.cpp
==============================================================================
--- trunk/libs/type_traits/test/is_convertible_test.cpp	(original)
+++ trunk/libs/type_traits/test/is_convertible_test.cpp	2007-10-22 13:48:51 EDT (Mon, 22 Oct 2007)
@@ -84,7 +84,11 @@
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<test_abc1&, test_abc2&>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<test_abc1&, int_constructible>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<int_constructible, test_abc1&>::value), false);
-#ifndef BOOST_NO_IS_ABSTRACT
+#if !defined(BOOST_NO_IS_ABSTRACT) && !(defined(__hppa) && defined(__HP_aCC))
+//
+// This doesn't work with aCC on PA RISC even though the is_abstract tests do
+// all pass, this may indicate a deeper problem...
+//
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<test_abc1&, test_abc2>::value), false);
 #endif
 

Modified: trunk/libs/type_traits/test/is_union_test.cpp
==============================================================================
--- trunk/libs/type_traits/test/is_union_test.cpp	(original)
+++ trunk/libs/type_traits/test/is_union_test.cpp	2007-10-22 13:48:51 EDT (Mon, 22 Oct 2007)
@@ -26,7 +26,7 @@
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<f1>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<enum_UDT>::value, false);
 
-#ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS
+#if defined(BOOST_HAS_TYPE_TRAITS_INTRINSICS) && !defined(__sgi)
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<union_UDT>::value, true);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<POD_union_UDT>::value, true);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<empty_union_UDT>::value, true);

Modified: trunk/libs/type_traits/test/promote_basic_test.cpp
==============================================================================
--- trunk/libs/type_traits/test/promote_basic_test.cpp	(original)
+++ trunk/libs/type_traits/test/promote_basic_test.cpp	2007-10-22 13:48:51 EDT (Mon, 22 Oct 2007)
@@ -84,7 +84,11 @@
 #endif
 
 // For this PP-logic to work we need a valid WCHAR_MAX etc:
-#if defined(BOOST_TT_AUX_WCHAR_MAX) && !defined(__DECCXX)
+#if defined(BOOST_TT_AUX_WCHAR_MAX) \
+   && !defined(__DECCXX) \
+   && !defined(__hpux) \
+   && !defined(_WIN32_WCE)
+
 #if BOOST_TT_AUX_WCHAR_MAX <= INT_MAX
     test_cv< wchar_t, int >();
 #elif WCHAR_MIN == 0 && BOOST_TT_AUX_WCHAR_MAX <= UINT_MAX
@@ -94,6 +98,7 @@
 #else
     test_cv< wchar_t, unsigned long >();
 #endif
+
 #endif
 
 #undef BOOST_TT_AUX_WCHAR_MAX