diff options
Diffstat (limited to 'libcxx/include/deque')
| -rw-r--r-- | libcxx/include/deque | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libcxx/include/deque b/libcxx/include/deque index c315fd2..b6e092b 100644 --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -956,8 +956,8 @@ public: using pointer = typename __alloc_traits::pointer; using const_pointer = typename __alloc_traits::const_pointer; - using __pointer_allocator = typename __rebind_alloc_helper<__alloc_traits, pointer>::type; - using __const_pointer_allocator = typename __rebind_alloc_helper<__alloc_traits, const_pointer>::type; + using __pointer_allocator = __rebind_alloc<__alloc_traits, pointer>; + using __const_pointer_allocator = __rebind_alloc<__alloc_traits, const_pointer>; using __map = __split_buffer<pointer, __pointer_allocator>; using __map_alloc_traits = allocator_traits<__pointer_allocator>; using __map_pointer = typename __map_alloc_traits::pointer; @@ -972,8 +972,9 @@ public: using reverse_iterator = std::reverse_iterator<iterator>; using const_reverse_iterator = std::reverse_iterator<const_iterator>; - static_assert(is_same<allocator_type, typename __rebind_alloc_helper<__alloc_traits, value_type>::type>::value, - "rebinding an allocator to value_type should result in the original allocator"); + static_assert(is_same<allocator_type, __rebind_alloc<__alloc_traits, value_type> >::value, + "[allocator.requirements] states that rebinding an allocator to the same type should result in the " + "original allocator"); static_assert(is_nothrow_default_constructible<allocator_type>::value == is_nothrow_default_constructible<__pointer_allocator>::value, "rebinding an allocator should not change excpetion guarantees"); |