diff options
Diffstat (limited to 'libcxx/include/deque')
| -rw-r--r-- | libcxx/include/deque | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/libcxx/include/deque b/libcxx/include/deque index 883332f..df3094c 100644 --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -456,12 +456,13 @@ template <class _ValueType, class _Pointer, class _Reference, class _MapPointer, struct __segmented_iterator_traits< __deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer, _DiffType, _BlockSize> > { private: - using _Iterator = __deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer, _DiffType, _BlockSize>; + using _Iterator _LIBCPP_NODEBUG = + __deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer, _DiffType, _BlockSize>; public: - using __is_segmented_iterator = true_type; - using __segment_iterator = _MapPointer; - using __local_iterator = _Pointer; + using __is_segmented_iterator _LIBCPP_NODEBUG = true_type; + using __segment_iterator _LIBCPP_NODEBUG = _MapPointer; + using __local_iterator _LIBCPP_NODEBUG = _Pointer; static _LIBCPP_HIDE_FROM_ABI __segment_iterator __segment(_Iterator __iter) { return __iter.__m_iter_; } static _LIBCPP_HIDE_FROM_ABI __local_iterator __local(_Iterator __iter) { return __iter.__ptr_; } @@ -491,8 +492,8 @@ public: using value_type = _Tp; - using allocator_type = _Allocator; - using __alloc_traits = allocator_traits<allocator_type>; + using allocator_type = _Allocator; + using __alloc_traits _LIBCPP_NODEBUG = allocator_traits<allocator_type>; static_assert(__check_valid_allocator<allocator_type>::value, ""); static_assert(is_same<typename allocator_type::value_type, value_type>::value, "Allocator::value_type must be same type as value_type"); @@ -503,13 +504,13 @@ public: using pointer = typename __alloc_traits::pointer; using const_pointer = typename __alloc_traits::const_pointer; - 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; - using __map_const_pointer = typename allocator_traits<__const_pointer_allocator>::const_pointer; - using __map_const_iterator = typename __map::const_iterator; + using __pointer_allocator _LIBCPP_NODEBUG = __rebind_alloc<__alloc_traits, pointer>; + using __const_pointer_allocator _LIBCPP_NODEBUG = __rebind_alloc<__alloc_traits, const_pointer>; + using __map _LIBCPP_NODEBUG = __split_buffer<pointer, __pointer_allocator>; + using __map_alloc_traits _LIBCPP_NODEBUG = allocator_traits<__pointer_allocator>; + using __map_pointer _LIBCPP_NODEBUG = typename __map_alloc_traits::pointer; + using __map_const_pointer _LIBCPP_NODEBUG = typename allocator_traits<__const_pointer_allocator>::const_pointer; + using __map_const_iterator _LIBCPP_NODEBUG = typename __map::const_iterator; using reference = value_type&; using const_reference = const value_type&; @@ -525,7 +526,7 @@ public: // - size_type: is always trivially relocatable, since it is required to be an integral type // - allocator_type: may not be trivially relocatable, so it's checked // None of these are referencing the `deque` itself, so if all of them are trivially relocatable, `deque` is too. - using __trivially_relocatable = __conditional_t< + using __trivially_relocatable _LIBCPP_NODEBUG = __conditional_t< __libcpp_is_trivially_relocatable<__map>::value && __libcpp_is_trivially_relocatable<allocator_type>::value, deque, void>; |