[Boost-commit] svn:boost r62161 - trunk/libs/config/test

Subject: [Boost-commit] svn:boost r62161 - trunk/libs/config/test
From: nielsdekker_at_[hidden]
Date: 2010-05-22 18:48:14

Author: niels_dekker
Date: 2010-05-22 18:48:13 EDT (Sat, 22 May 2010)
New Revision: 62161
URL: http://svn.boost.org/trac/boost/changeset/62161

Log:
Removed temporary code, skipping value-initialization of pointer-to-member objects for Intel <= 11.1.
Text files modified: 
   trunk/libs/config/test/boost_no_com_value_init.ipp |    17 ++---------------                       
   1 files changed, 2 insertions(+), 15 deletions(-)

Modified: trunk/libs/config/test/boost_no_com_value_init.ipp
==============================================================================
--- trunk/libs/config/test/boost_no_com_value_init.ipp	(original)
+++ trunk/libs/config/test/boost_no_com_value_init.ipp	2010-05-22 18:48:13 EDT (Sat, 22 May 2010)
@@ -517,17 +517,6 @@
 // the function above here.
 #define FAILED_TO_VALUE_INITIALIZE(value) failed_to_value_initialized(value, #value)
 
-// TODO Niels Dekker, May 17, 2010: The following code is meant to be very tentative (trunk only).
-// It should be removed later this month, and is certainly not meant to become part of the release branch!!!
-#ifdef __INTEL_COMPILER
-    #if __INTEL_COMPILER <= 1110
-    // The following macro indicates that initialization of ptr_to_member must be skipped.
-    // Such an initialization triggered an internal error (assertion failed at: "shared/edgglue/edg_expr.c", 
-    // line 2859) on Intel <= 11.1 (Intel support issue 589832, reported by John Maddock, May 2010).
-	#define BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
-    #endif
-#endif
-
 
   // value_initializer initializes each of its data members by means
   // of an empty set of parentheses, and allows checking whether
@@ -771,9 +760,7 @@
         FAILED_TO_VALUE_INITIALIZE(m_member_function_ptr_struct) +
         FAILED_TO_VALUE_INITIALIZE(m_member_function_ptr_struct_array[0]) +
         FAILED_TO_VALUE_INITIALIZE(m_member_function_ptr_struct_array[1]) +
-#ifdef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
-        ( (std::cout << "Note: Skipped ptr_to_member checks\n"), 1) +
-#else
+#ifndef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
         FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member) +
         FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member_array[0]) +
         FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member_array[1]) +
@@ -1028,7 +1015,7 @@
         << num_failures_of_temporaries << '+'
         << num_failures_of_heap_objects << "): "
         << total_num_failures
-        << "\nDetected by boost_no_complete_value_initialization::test() revision 30."
+        << "\nDetected by boost_no_complete_value_initialization::test() revision 31."
         << std::endl;
     }
     return static_cast<int>(total_num_failures);