Unordered: Merge allocator fix + improved tests. Fixes #7100.

[SVN r79547]
2012-07-15 23:58:02 +00:00
parent cf9930fe20
commit d77453b7ad
14 changed files with 242 additions and 90 deletions
--- a/test/unordered/unnecessary_copy_tests.cpp
+++ b/test/unordered/unnecessary_copy_tests.cpp
@@ -245,7 +245,8 @@ namespace unnecessary_copy_tests
        // the existing element.
        reset();
        x.emplace();
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_VARIADIC_TEMPLATES) || \
+    !defined(BOOST_NO_RVALUE_REFERENCES)
        // source_cost doesn't make much sense here, but it seems to fit.
        COPY_COUNT(1); MOVE_COUNT(source_cost);
 #else