From 40cd7e37147a0cc5d1196a0eff9552ee96f1d811 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Tue, 3 Sep 2019 14:38:29 +0200 Subject: [PATCH] refined previous commit --- test/test_construction.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/test_construction.cpp b/test/test_construction.cpp index c401aa9..b1baa6e 100644 --- a/test/test_construction.cpp +++ b/test/test_construction.cpp @@ -80,15 +80,6 @@ void test_allocator_aware_construction() */ if(AlwaysEqual) -#endif -#if !defined(BOOST_MSVC)&&\ - BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB,BOOST_TESTED_AT(804)) - /* Very odd behavior probably due to std::unordered_map allocator move ctor - * being implemented with move assignment, as reported in - * https://github.com/boostorg/poly_collection/issues/16 - */ - - if(!(Propagate&&!AlwaysEqual)) #endif { rooted_poly_collection p2{cp}; @@ -110,6 +101,16 @@ void test_allocator_aware_construction() BOOST_TEST(p2.empty()); do_((BOOST_TEST(!p2.template is_registered()),0)...); + +#if !defined(BOOST_MSVC)&&\ + BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB,BOOST_TESTED_AT(804)) + /* Very odd behavior probably due to std::unordered_map allocator move + * ctor being implemented with move assignment, as reported in + * https://github.com/boostorg/poly_collection/issues/16 + */ + + if(!(Propagate&&!AlwaysEqual)) +#endif BOOST_TEST(p3.get_allocator().comes_from(root2)); } {