diff --git a/test/unordered/insert_tests.cpp b/test/unordered/insert_tests.cpp index 54cca259..9db9e3f1 100644 --- a/test/unordered/insert_tests.cpp +++ b/test/unordered/insert_tests.cpp @@ -541,9 +541,11 @@ UNORDERED_AUTO_TEST(map_emplace_test) { boost::unordered_map x; +#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x5100)) x.emplace(); BOOST_TEST(x.find(0) != x.end() && x.find(0)->second == overloaded_constructor()); +#endif x.emplace(2, 3); BOOST_TEST(x.find(2) != x.end() && @@ -569,8 +571,10 @@ UNORDERED_AUTO_TEST(set_emplace_test) boost::unordered_set x; overloaded_constructor check; +#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x5100)) x.emplace(); BOOST_TEST(x.find(check) != x.end() && *x.find(check) == check); +#endif x.clear(); x.emplace(1); diff --git a/test/unordered/unnecessary_copy_tests.cpp b/test/unordered/unnecessary_copy_tests.cpp index 45c61c07..b033b0df 100644 --- a/test/unordered/unnecessary_copy_tests.cpp +++ b/test/unordered/unnecessary_copy_tests.cpp @@ -238,6 +238,7 @@ namespace unnecessary_copy_tests // 0 arguments // +#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x5100)) // The container will have to create a copy in order to compare with // the existing element. reset(); @@ -247,6 +248,7 @@ namespace unnecessary_copy_tests #else // source_cost doesn't make much sense here, but it seems to fit. COPY_COUNT(1); MOVE_COUNT(source_cost); +#endif #endif // @@ -323,10 +325,12 @@ namespace unnecessary_copy_tests // 0 arguments // +#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x5100)) // COPY_COUNT(1) would be okay here. reset(); x.emplace(); COPY_COUNT(2); MOVE_COUNT(0); +#endif reset(); x.emplace(boost::unordered::piecewise_construct,