From cfd52c8f38f6e946ed9a42c87a973ed3101f610e Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Fri, 26 Aug 2011 08:11:12 +0000
Subject: [PATCH] Unordered: Fix compiler check in unnecessary_copy_tests.

[SVN r74066]
---
 test/unordered/unnecessary_copy_tests.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/unordered/unnecessary_copy_tests.cpp b/test/unordered/unnecessary_copy_tests.cpp
index fe97dcfe..6ebfd8b5 100644
--- a/test/unordered/unnecessary_copy_tests.cpp
+++ b/test/unordered/unnecessary_copy_tests.cpp
@@ -341,7 +341,10 @@ namespace unnecessary_copy_tests
         x.emplace(source<std::pair<count_copies, count_copies> >());
         COPY_COUNT(2); MOVE_COUNT(source_pair_cost);
 
-#if !defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)
+#if (defined(__GNUC__) && __GNUC__ > 4) || \
+    (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ > 2) || \
+    (defined(BOOST_MSVC) && BOOST_MSVC >= 1600 ) || \
+    (!defined(__GNUC__) && !defined(BOOST_MSVC))
         count_copies part;
         reset();
         std::pair<count_copies const&, count_copies const&> a_ref(part, part);