From 56da3bb7ea69b19380b1e37265b31ac0de7db7ce Mon Sep 17 00:00:00 2001
From: Niels Dekker <nielsdekker@xs4all.nl>
Date: Fri, 21 May 2010 18:03:58 +0000
Subject: [PATCH] Temporarily skipped value-initialization of all ptr-to-member
 objects for Intel <= 11.1, as another try to avoid the internal error, Intel
 support issue 589832.

[SVN r62126]
---
 test/boost_no_com_value_init.ipp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/boost_no_com_value_init.ipp b/test/boost_no_com_value_init.ipp
index 9651b54d..699ccd23 100644
--- a/test/boost_no_com_value_init.ipp
+++ b/test/boost_no_com_value_init.ipp
@@ -576,10 +576,8 @@ namespace boost_no_complete_value_initialization
     member_function_ptr_type m_member_function_ptr_array[2];
     member_function_ptr_struct m_member_function_ptr_struct;
     member_function_ptr_struct m_member_function_ptr_struct_array[2];
-#ifndef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
     ptr_to_member_type  m_ptr_to_member;
     ptr_to_member_type  m_ptr_to_member_array[2];
-#endif
     ptr_to_member_struct m_ptr_to_member_struct;
     ptr_to_member_struct m_ptr_to_member_struct_array[2];
     bit_field_struct m_bit_field_struct;
@@ -673,9 +671,9 @@ namespace boost_no_complete_value_initialization
 #ifndef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
     m_ptr_to_member(),
     m_ptr_to_member_array(),
-#endif
     m_ptr_to_member_struct(),
     m_ptr_to_member_struct_array(),
+#endif
     m_bit_field_struct(),
     m_bit_field_struct_array(),
     m_int_struct(),
@@ -779,10 +777,10 @@ namespace boost_no_complete_value_initialization
         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]) +
-#endif
         FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member_struct) +
         FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member_struct_array[0]) +
         FAILED_TO_VALUE_INITIALIZE(m_ptr_to_member_struct_array[1]) +
+#endif
         FAILED_TO_VALUE_INITIALIZE(m_bit_field_struct) +
         FAILED_TO_VALUE_INITIALIZE(m_bit_field_struct_array[0]) +
         FAILED_TO_VALUE_INITIALIZE(m_bit_field_struct_array[1]) +
@@ -868,8 +866,10 @@ namespace boost_no_complete_value_initialization
       FAILED_TO_VALUE_INITIALIZE(function_ptr_struct()) +
       FAILED_TO_VALUE_INITIALIZE(member_function_ptr_type()) +
       FAILED_TO_VALUE_INITIALIZE(member_function_ptr_struct()) +
+#ifndef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
       FAILED_TO_VALUE_INITIALIZE(ptr_to_member_type()) +
       FAILED_TO_VALUE_INITIALIZE(ptr_to_member_struct()) +
+#endif
       FAILED_TO_VALUE_INITIALIZE(int_struct()) +
       FAILED_TO_VALUE_INITIALIZE(int_struct_holder()) +
       FAILED_TO_VALUE_INITIALIZE(pod_struct()) +
@@ -922,8 +922,10 @@ namespace boost_no_complete_value_initialization
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<function_ptr_struct>() ) +
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<member_function_ptr_type>() ) +
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<member_function_ptr_struct>() ) +
+#ifndef BOOST_DETAIL_NO_COMPLETE_VALUE_INITIALIZATION_SKIP_PTR_TO_MEMBER
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<ptr_to_member_type>() ) +
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<ptr_to_member_struct>() ) +
+#endif
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<bit_field_struct>() ) +
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<int_struct>() ) +
       FAILED_TO_VALUE_INITIALIZE( heap_object_wrapper<int_struct>() ) +
@@ -1026,7 +1028,7 @@ namespace boost_no_complete_value_initialization
         << num_failures_of_temporaries << '+'
         << num_failures_of_heap_objects << "): "
         << total_num_failures
-        << "\nDetected by boost_no_complete_value_initialization::test() revision 29."
+        << "\nDetected by boost_no_complete_value_initialization::test() revision 30."
         << std::endl;
     }
     return static_cast<int>(total_num_failures);