From f709c16d708a9228f7b25988a7a6795d5b45bf2b Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Fri, 20 Nov 2009 09:16:36 +0000
Subject: [PATCH] Merge [56844]: Correct macro checks for initializer lists.

[SVN r57801]
---
 test/unordered/assign_tests.cpp      | 3 ++-
 test/unordered/constructor_tests.cpp | 3 ++-
 test/unordered/insert_tests.cpp      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/unordered/assign_tests.cpp b/test/unordered/assign_tests.cpp
index 56df1b20..2bfb39fe 100644
--- a/test/unordered/assign_tests.cpp
+++ b/test/unordered/assign_tests.cpp
@@ -118,7 +118,8 @@ UNORDERED_AUTO_TEST(assign_default_initializer_list) {
 
 #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)
 {
diff --git a/test/unordered/constructor_tests.cpp b/test/unordered/constructor_tests.cpp
index 8ddd005c..5a719e2a 100644
--- a/test/unordered/constructor_tests.cpp
+++ b/test/unordered/constructor_tests.cpp
@@ -365,7 +365,8 @@ UNORDERED_AUTO_TEST(test_default_initializer_list) {
 
 #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";
diff --git a/test/unordered/insert_tests.cpp b/test/unordered/insert_tests.cpp
index b116acc0..69d1c67c 100644
--- a/test/unordered/insert_tests.cpp
+++ b/test/unordered/insert_tests.cpp
@@ -393,7 +393,8 @@ UNORDERED_TEST(map_insert_range_test2,
     ((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)
 {