[Boost-commit] svn:boost r57801 - in branches/release/libs/unordered: . test/unordered

Subject: [Boost-commit] svn:boost r57801 - in branches/release/libs/unordered: . test/unordered
From: daniel_james_at_[hidden]
Date: 2009-11-20 04:16:39

Author: danieljames
Date: 2009-11-20 04:16:36 EST (Fri, 20 Nov 2009)
New Revision: 57801
URL: http://svn.boost.org/trac/boost/changeset/57801

Log:
Merge [56844]: Correct macro checks for initializer lists.

Properties modified: 
   branches/release/libs/unordered/   (props changed)
Text files modified: 
   branches/release/libs/unordered/test/unordered/assign_tests.cpp      |     3 ++-                                     
   branches/release/libs/unordered/test/unordered/constructor_tests.cpp |     3 ++-                                     
   branches/release/libs/unordered/test/unordered/insert_tests.cpp      |     3 ++-                                     
   3 files changed, 6 insertions(+), 3 deletions(-)

Modified: branches/release/libs/unordered/test/unordered/assign_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/assign_tests.cpp	(original)
+++ branches/release/libs/unordered/test/unordered/assign_tests.cpp	2009-11-20 04:16:36 EST (Fri, 20 Nov 2009)
@@ -118,7 +118,8 @@
 
 #endif
 
-#if !defined(BOOST_NO_INITIALIZER_LISTS)
+#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST) && \
+    !defined(BOOST_NO_INITIALIZER_LISTS)
 
 UNORDERED_AUTO_TEST(assign_initializer_list)
 {

Modified: branches/release/libs/unordered/test/unordered/constructor_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/constructor_tests.cpp	(original)
+++ branches/release/libs/unordered/test/unordered/constructor_tests.cpp	2009-11-20 04:16:36 EST (Fri, 20 Nov 2009)
@@ -365,7 +365,8 @@
 
 #endif
 
-#if !defined(BOOST_NO_INITIALIZER_LISTS)
+#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST) && \
+    !defined(BOOST_NO_INITIALIZER_LISTS)
 
 UNORDERED_AUTO_TEST(test_initializer_list) {
     std::cerr<<"Initializer List Tests\n";

Modified: branches/release/libs/unordered/test/unordered/insert_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/insert_tests.cpp	(original)
+++ branches/release/libs/unordered/test/unordered/insert_tests.cpp	2009-11-20 04:16:36 EST (Fri, 20 Nov 2009)
@@ -393,7 +393,8 @@
     ((default_generator)(generate_collisions))
 )
 
-#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST)
+#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST) && \
+    !defined(BOOST_NO_INITIALIZER_LISTS)
 
 UNORDERED_AUTO_TEST(insert_initializer_list_set)
 {