From 574783675446c21db0b1579b1915acc42d32ea80 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 10 Nov 2009 18:17:53 +0000 Subject: [PATCH] Change unordered move tests to be more lenient on compilers without NRVO. Will probably need to reintroduce some of the failure markup later. [SVN r57550] --- test/unordered/move_tests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/unordered/move_tests.cpp b/test/unordered/move_tests.cpp index 3d06686b..20f35c35 100644 --- a/test/unordered/move_tests.cpp +++ b/test/unordered/move_tests.cpp @@ -64,7 +64,9 @@ namespace move_tests test::random_values v(1000, generator); test::object_count count; T y(create(v, count)); +#if defined(BOOST_HAS_NRVO) BOOST_TEST(count == test::global_object_count); +#endif test::check_container(y, v); test::check_equivalent_keys(y); } @@ -78,7 +80,9 @@ namespace move_tests test::object_count count; T y; y = create(v, count); +#if defined(BOOST_HAS_NRVO) BOOST_TEST(count == test::global_object_count); +#endif test::check_container(y, v); test::check_equivalent_keys(y); } @@ -98,7 +102,9 @@ namespace move_tests { test::random_values v(500, generator); T y(create(v, count, hf, eq, al, 0.5)); +#if defined(BOOST_HAS_NRVO) BOOST_TEST(count == test::global_object_count); +#endif test::check_container(y, v); BOOST_TEST(test::equivalent(y.hash_function(), hf)); BOOST_TEST(test::equivalent(y.key_eq(), eq));