tmp/tmpusugpkm2/{from.md → to.md}
RENAMED
|
@@ -46,17 +46,17 @@ namespace std {
|
|
| 46 |
|
| 47 |
public:
|
| 48 |
using outer_allocator_type = OuterAlloc;
|
| 49 |
using inner_allocator_type = see below;
|
| 50 |
|
| 51 |
-
using value_type =
|
| 52 |
-
using size_type =
|
| 53 |
-
using difference_type =
|
| 54 |
-
using pointer =
|
| 55 |
-
using const_pointer =
|
| 56 |
-
using void_pointer =
|
| 57 |
-
using const_void_pointer =
|
| 58 |
|
| 59 |
using propagate_on_container_copy_assignment = see below;
|
| 60 |
using propagate_on_container_move_assignment = see below;
|
| 61 |
using propagate_on_container_swap = see below;
|
| 62 |
using is_always_equal = see below;
|
|
@@ -89,12 +89,12 @@ namespace std {
|
|
| 89 |
inner_allocator_type& inner_allocator() noexcept;
|
| 90 |
const inner_allocator_type& inner_allocator() const noexcept;
|
| 91 |
outer_allocator_type& outer_allocator() noexcept;
|
| 92 |
const outer_allocator_type& outer_allocator() const noexcept;
|
| 93 |
|
| 94 |
-
|
| 95 |
-
|
| 96 |
void deallocate(pointer p, size_type n);
|
| 97 |
size_type max_size() const;
|
| 98 |
|
| 99 |
template<class T, class... Args>
|
| 100 |
void construct(T* p, Args&&... args);
|
|
|
|
| 46 |
|
| 47 |
public:
|
| 48 |
using outer_allocator_type = OuterAlloc;
|
| 49 |
using inner_allocator_type = see below;
|
| 50 |
|
| 51 |
+
using value_type = OuterTraits::value_type;
|
| 52 |
+
using size_type = OuterTraits::size_type;
|
| 53 |
+
using difference_type = OuterTraits::difference_type;
|
| 54 |
+
using pointer = OuterTraits::pointer;
|
| 55 |
+
using const_pointer = OuterTraits::const_pointer;
|
| 56 |
+
using void_pointer = OuterTraits::void_pointer;
|
| 57 |
+
using const_void_pointer = OuterTraits::const_void_pointer;
|
| 58 |
|
| 59 |
using propagate_on_container_copy_assignment = see below;
|
| 60 |
using propagate_on_container_move_assignment = see below;
|
| 61 |
using propagate_on_container_swap = see below;
|
| 62 |
using is_always_equal = see below;
|
|
|
|
| 89 |
inner_allocator_type& inner_allocator() noexcept;
|
| 90 |
const inner_allocator_type& inner_allocator() const noexcept;
|
| 91 |
outer_allocator_type& outer_allocator() noexcept;
|
| 92 |
const outer_allocator_type& outer_allocator() const noexcept;
|
| 93 |
|
| 94 |
+
pointer allocate(size_type n);
|
| 95 |
+
pointer allocate(size_type n, const_void_pointer hint);
|
| 96 |
void deallocate(pointer p, size_type n);
|
| 97 |
size_type max_size() const;
|
| 98 |
|
| 99 |
template<class T, class... Args>
|
| 100 |
void construct(T* p, Args&&... args);
|