--- boost/bimap/detail/bimap_core.hpp +++ boost/bimap/detail/bimap_core.hpp @@ -404,8 +404,8 @@ < relation, core_indices, - BOOST_DEDUCED_TYPENAME parameters::allocator:: - BOOST_NESTED_TEMPLATE rebind::other + typename std::allocator_traits:: + BOOST_NESTED_TEMPLATE rebind_alloc > core_type; --- boost/format/alt_sstream_impl.hpp +++ boost/format/alt_sstream_impl.hpp @@ -258,7 +258,7 @@ void *vdptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0); newptr = static_cast(vdptr); #else - newptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0); + newptr = std::allocator_traits::allocate(alloc_, new_size, is_allocated_? oldptr : 0); #endif }