Skip to content

Commit 4348234

Browse files
committed
Remove _LIBCPP_NODEBUG from the public API aliases.
1 parent 05b2257 commit 4348234

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

libcxx/include/__memory/allocator_traits.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -236,34 +236,34 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(allocation_result);
236236

237237
template <class _Alloc>
238238
struct _LIBCPP_TEMPLATE_VIS allocator_traits {
239-
using allocator_type _LIBCPP_NODEBUG = _Alloc;
240-
using value_type _LIBCPP_NODEBUG = typename allocator_type::value_type;
241-
using pointer _LIBCPP_NODEBUG = __pointer<value_type, allocator_type>;
242-
using const_pointer _LIBCPP_NODEBUG = typename __const_pointer<value_type, pointer, allocator_type>::type;
243-
using void_pointer _LIBCPP_NODEBUG = typename __void_pointer<pointer, allocator_type>::type;
244-
using const_void_pointer _LIBCPP_NODEBUG = typename __const_void_pointer<pointer, allocator_type>::type;
245-
using difference_type _LIBCPP_NODEBUG = typename __alloc_traits_difference_type<allocator_type, pointer>::type;
246-
using size_type _LIBCPP_NODEBUG = __size_type<allocator_type, difference_type>;
247-
using propagate_on_container_copy_assignment _LIBCPP_NODEBUG =
239+
using allocator_type = _Alloc;
240+
using value_type = typename allocator_type::value_type;
241+
using pointer = __pointer<value_type, allocator_type>;
242+
using const_pointer = typename __const_pointer<value_type, pointer, allocator_type>::type;
243+
using void_pointer = typename __void_pointer<pointer, allocator_type>::type;
244+
using const_void_pointer = typename __const_void_pointer<pointer, allocator_type>::type;
245+
using difference_type = typename __alloc_traits_difference_type<allocator_type, pointer>::type;
246+
using size_type = __size_type<allocator_type, difference_type>;
247+
using propagate_on_container_copy_assignment =
248248
__propagate_on_container_copy_assignment<allocator_type>;
249-
using propagate_on_container_move_assignment _LIBCPP_NODEBUG =
249+
using propagate_on_container_move_assignment =
250250
__propagate_on_container_move_assignment<allocator_type>;
251-
using propagate_on_container_swap _LIBCPP_NODEBUG = __propagate_on_container_swap<allocator_type>;
252-
using is_always_equal _LIBCPP_NODEBUG = __is_always_equal<allocator_type>;
251+
using propagate_on_container_swap = __propagate_on_container_swap<allocator_type>;
252+
using is_always_equal = __is_always_equal<allocator_type>;
253253

254254
#ifndef _LIBCPP_CXX03_LANG
255255
template <class _Tp>
256-
using rebind_alloc _LIBCPP_NODEBUG = __allocator_traits_rebind_t<allocator_type, _Tp>;
256+
using rebind_alloc = __allocator_traits_rebind_t<allocator_type, _Tp>;
257257
template <class _Tp>
258-
using rebind_traits _LIBCPP_NODEBUG = allocator_traits<rebind_alloc<_Tp> >;
258+
using rebind_traits = allocator_traits<rebind_alloc<_Tp> >;
259259
#else // _LIBCPP_CXX03_LANG
260260
template <class _Tp>
261261
struct rebind_alloc {
262-
using other _LIBCPP_NODEBUG = __allocator_traits_rebind_t<allocator_type, _Tp>;
262+
using other = __allocator_traits_rebind_t<allocator_type, _Tp>;
263263
};
264264
template <class _Tp>
265265
struct rebind_traits {
266-
using other _LIBCPP_NODEBUG = allocator_traits<typename rebind_alloc<_Tp>::other>;
266+
using other = allocator_traits<typename rebind_alloc<_Tp>::other>;
267267
};
268268
#endif // _LIBCPP_CXX03_LANG
269269

libcxx/include/__memory/unique_ptr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS unique_ptr<_Tp[], _Dp>
410410
public:
411411
typedef _Tp element_type;
412412
typedef _Dp deleter_type;
413-
using pointer _LIBCPP_NODEBUG = __pointer<_Tp, deleter_type>;
413+
using pointer = __pointer<_Tp, deleter_type>;
414414

415415
// A unique_ptr contains the following members which may be trivially relocatable:
416416
// - pointer: this may be trivially relocatable, so it's checked

0 commit comments

Comments
 (0)