Merge branch 'develop' into feature/update-travis

2020-12-31 13:54:01 -05:00
parent a13a82f8c1 5726534f6d
commit 82a51aea40
1 changed files with 2 additions and 1 deletions
--- a/test/allocator_size_type_test.cpp
+++ b/test/allocator_size_type_test.cpp
@ -27,7 +27,8 @@ int main()
    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int,
        boost::allocator_size_type<A1<char> >::type>));
 #if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<std::size_t,
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<
+        std::make_unsigned<std::ptrdiff_t>::type,
        boost::allocator_size_type<A2<int> >::type>));
 #endif
    return boost::report_errors();