Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r74066 - trunk/libs/unordered/test/unordered
From: dnljms_at_[hidden]
Date: 2011-08-26 04:11:15


Author: danieljames
Date: 2011-08-26 04:11:12 EDT (Fri, 26 Aug 2011)
New Revision: 74066
URL: http://svn.boost.org/trac/boost/changeset/74066

Log:
Unordered: Fix compiler check in unnecessary_copy_tests.
Text files modified:
   trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp | 5 ++++-
   1 files changed, 4 insertions(+), 1 deletions(-)

Modified: trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp 2011-08-26 04:11:12 EDT (Fri, 26 Aug 2011)
@@ -341,7 +341,10 @@
         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);


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk