feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Tweak compiler checks in unnecessary_copy_tests.

Browse Source 
I'm running these tests by default now, which will probably break
several compilers, so I'll need to add extra conditions later.
This commit is contained in:
Daniel James
2014-01-15 00:00:01 +00:00
parent 7d0c6d2425
commit 8ae166a2c3
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/unordered/unnecessary_copy_tests.cpp
View File

@ -441,9 +441,8 @@ namespace unnecessary_copy_tests
x.emplace(source<std::pair<count_copies, count_copies> >()); x.emplace(source<std::pair<count_copies, count_copies> >());
COPY_COUNT(2); MOVE_COUNT(source_pair_cost); COPY_COUNT(2); MOVE_COUNT(source_pair_cost);
#if (defined(__GNUC__) && __GNUC__ > 4) || \ #if !(defined(__GNUC__) && __cplusplus < 199900L) && \
(defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ > 2) || \ !(defined(BOOST_MSVC) && BOOST_MSVC < 1600)
(defined(BOOST_MSVC) && BOOST_MSVC >= 1600 )
count_copies part; count_copies part;
reset(); reset();
std::pair<count_copies const&, count_copies const&> a_ref(part, part); std::pair<count_copies const&, count_copies const&> a_ref(part, part);
@ -510,8 +509,8 @@ namespace unnecessary_copy_tests
COPY_COUNT(tuple_copy_cost); COPY_COUNT(tuple_copy_cost);
MOVE_COUNT(tuple_move_cost); MOVE_COUNT(tuple_move_cost);
#if defined(__GNUC__) && __GNUC__ > 4 || \ #if !defined(BOOST_NO_CXX11_HDR_TUPLE) && \
defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 6 !(defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6)
reset(); reset();
x.emplace(boost::unordered::piecewise_construct, x.emplace(boost::unordered::piecewise_construct,
std::forward_as_tuple(b.first), std::forward_as_tuple(b.first),