blob: 30a34e1b216d557df598025ada8b49942d5c12e4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
--- 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<relation>::other
+ typename std::allocator_traits<BOOST_DEDUCED_TYPENAME parameters::allocator>::
+ BOOST_NESTED_TEMPLATE rebind_alloc<relation>
> 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<Ch *>(vdptr);
#else
- newptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0);
+ newptr = std::allocator_traits<compat_allocator_type>::allocate(alloc_, new_size, is_allocated_? oldptr : 0);
#endif
}
|
