Skip to content

Commit 8c3aa3e

Browse files
authored
[libc++][NFC] Replace typedefs with using declarations in <vector> (#134083)
This brings the code base a bit closer to using `using` declarations everywhere.
1 parent 883afa4 commit 8c3aa3e

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

libcxx/include/__vector/vector.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,28 +89,28 @@ class vector {
8989
//
9090
// Types
9191
//
92-
typedef vector __self;
93-
typedef _Tp value_type;
94-
typedef _Allocator allocator_type;
95-
typedef allocator_traits<allocator_type> __alloc_traits;
96-
typedef value_type& reference;
97-
typedef const value_type& const_reference;
98-
typedef typename __alloc_traits::size_type size_type;
99-
typedef typename __alloc_traits::difference_type difference_type;
100-
typedef typename __alloc_traits::pointer pointer;
101-
typedef typename __alloc_traits::const_pointer const_pointer;
92+
using __self _LIBCPP_NODEBUG = vector;
93+
using value_type = _Tp;
94+
using allocator_type = _Allocator;
95+
using __alloc_traits _LIBCPP_NODEBUG = allocator_traits<allocator_type>;
96+
using reference = value_type&;
97+
using const_reference = const value_type&;
98+
using size_type = typename __alloc_traits::size_type;
99+
using difference_type = typename __alloc_traits::difference_type;
100+
using pointer = typename __alloc_traits::pointer;
101+
using const_pointer = typename __alloc_traits::const_pointer;
102102
#ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR
103103
// Users might provide custom allocators, and prior to C++20 we have no existing way to detect whether the allocator's
104104
// pointer type is contiguous (though it has to be by the Standard). Using the wrapper type ensures the iterator is
105105
// considered contiguous.
106-
typedef __bounded_iter<__wrap_iter<pointer> > iterator;
107-
typedef __bounded_iter<__wrap_iter<const_pointer> > const_iterator;
106+
using iterator = __bounded_iter<__wrap_iter<pointer> >;
107+
using const_iterator = __bounded_iter<__wrap_iter<const_pointer> >;
108108
#else
109-
typedef __wrap_iter<pointer> iterator;
110-
typedef __wrap_iter<const_pointer> const_iterator;
109+
using iterator = __wrap_iter<pointer>;
110+
using const_iterator = __wrap_iter<const_pointer>;
111111
#endif
112-
typedef std::reverse_iterator<iterator> reverse_iterator;
113-
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
112+
using reverse_iterator = std::reverse_iterator<iterator>;
113+
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
114114

115115
// A vector containers the following members which may be trivially relocatable:
116116
// - pointer: may be trivially relocatable, so it's checked

libcxx/include/__vector/vector_bool.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,36 +77,36 @@ struct __has_storage_type<vector<bool, _Allocator> > {
7777
template <class _Allocator>
7878
class vector<bool, _Allocator> {
7979
public:
80-
typedef vector __self;
81-
typedef bool value_type;
82-
typedef _Allocator allocator_type;
83-
typedef allocator_traits<allocator_type> __alloc_traits;
84-
typedef typename __alloc_traits::size_type size_type;
85-
typedef typename __alloc_traits::difference_type difference_type;
86-
typedef size_type __storage_type;
87-
typedef __bit_iterator<vector, false> pointer;
88-
typedef __bit_iterator<vector, true> const_pointer;
89-
typedef pointer iterator;
90-
typedef const_pointer const_iterator;
91-
typedef std::reverse_iterator<iterator> reverse_iterator;
92-
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
80+
using __self _LIBCPP_NODEBUG = vector;
81+
using value_type = bool;
82+
using allocator_type = _Allocator;
83+
using __alloc_traits _LIBCPP_NODEBUG = allocator_traits<allocator_type>;
84+
using size_type = typename __alloc_traits::size_type;
85+
using difference_type = typename __alloc_traits::difference_type;
86+
using __storage_type _LIBCPP_NODEBUG = size_type;
87+
using pointer = __bit_iterator<vector, false>;
88+
using const_pointer = __bit_iterator<vector, true>;
89+
using iterator = pointer;
90+
using const_iterator = const_pointer;
91+
using reverse_iterator = std::reverse_iterator<iterator>;
92+
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
9393

9494
private:
95-
typedef __rebind_alloc<__alloc_traits, __storage_type> __storage_allocator;
96-
typedef allocator_traits<__storage_allocator> __storage_traits;
97-
typedef typename __storage_traits::pointer __storage_pointer;
98-
typedef typename __storage_traits::const_pointer __const_storage_pointer;
95+
using __storage_allocator _LIBCPP_NODEBUG = __rebind_alloc<__alloc_traits, __storage_type>;
96+
using __storage_traits _LIBCPP_NODEBUG = allocator_traits<__storage_allocator>;
97+
using __storage_pointer _LIBCPP_NODEBUG = typename __storage_traits::pointer;
98+
using __const_storage_pointer _LIBCPP_NODEBUG = typename __storage_traits::const_pointer;
9999

100100
__storage_pointer __begin_;
101101
size_type __size_;
102102
_LIBCPP_COMPRESSED_PAIR(size_type, __cap_, __storage_allocator, __alloc_);
103103

104104
public:
105-
typedef __bit_reference<vector> reference;
105+
using reference = __bit_reference<vector>;
106106
#ifdef _LIBCPP_ABI_BITSET_VECTOR_BOOL_CONST_SUBSCRIPT_RETURN_BOOL
107107
using const_reference = bool;
108108
#else
109-
typedef __bit_const_reference<vector> const_reference;
109+
using const_reference = __bit_const_reference<vector>;
110110
#endif
111111

112112
private:

0 commit comments

Comments
 (0)