Removed temporary code, skipping value-initialization of pointer-to-member objects for Intel <= 11.1.

[SVN r62161]
This commit is contained in:
Niels Dekker
2010-05-22 22:48:13 +00:00
parent ab638ef45d
commit 40a0eeeef0

View File

@ -517,17 +517,6 @@ namespace boost_no_complete_value_initialization
// the function above here. // the function above here.
#define FAILED_TO_VALUE_INITIALIZE(value) failed_to_value_initialized(value, #value) #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 // value_initializer initializes each of its data members by means
// of an empty set of parentheses, and allows checking whether // of an empty set of parentheses, and allows checking whether
@ -771,9 +760,7 @@ namespace boost_no_complete_value_initialization
FAILED_TO_VALUE_INITIALIZE(m_member_function_ptr_struct) + 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[0]) +
FAILED_TO_VALUE_INITIALIZE(m_member_function_ptr_struct_array[1]) + FAILED_TO_VALUE_INITIALIZE(m_member_function_ptr_struct_array[1]) +
#ifdef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER #ifndef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
( (std::cout << "Note: Skipped ptr_to_member checks\n"), 1) +
#else
FAILED_TO_VALUE_INITIALIZE(m_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[0]) +
FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member_array[1]) + FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member_array[1]) +
@ -1028,7 +1015,7 @@ namespace boost_no_complete_value_initialization
<< num_failures_of_temporaries << '+' << num_failures_of_temporaries << '+'
<< num_failures_of_heap_objects << "): " << num_failures_of_heap_objects << "): "
<< total_num_failures << 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; << std::endl;
} }
return static_cast<int>(total_num_failures); return static_cast<int>(total_num_failures);