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

Unordered: Merge from trunk.

Browse Source 
Portability fixes, and fix some issues with constructing std::pair.


[SVN r74101]
This commit is contained in:
Daniel James
2011-08-28 11:26:38 +00:00
parent a4372314c2
commit f6f19aaaaa
10 changed files with 531 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/unordered/unnecessary_copy_tests.cpp
View File

@@ -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);