Skip to content

Commit 1af78d4

Browse files
FlastFlast
committed
Refactor
1 parent 515fff3 commit 1af78d4

File tree

6 files changed

+94
-94
lines changed

6 files changed

+94
-94
lines changed

‎flat_map/__binary_flat_tree.hpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ class _binary_flat_tree_base : private detail::comparator_store<Compare>
2727
Container _container;
2828

2929
public:
30-
using key_type = Key;
31-
using value_type = typename Container::value_type;
32-
using size_type = std::size_t;
33-
using difference_type = std::ptrdiff_t;
34-
using key_compare = Compare;
35-
using allocator_type = typename Container::allocator_type;
36-
using reference = typename Container::reference;
37-
using const_reference = typename Container::const_reference;
38-
using pointer = typename Container::pointer;
39-
using const_pointer = typename Container::const_pointer;
40-
using iterator = typename Container::iterator;
41-
using const_iterator = typename Container::const_iterator;
42-
using reverse_iterator = typename Container::reverse_iterator;
30+
using key_type = Key;
31+
using value_type = typename Container::value_type;
32+
using size_type = std::size_t;
33+
using difference_type = std::ptrdiff_t;
34+
using key_compare = Compare;
35+
using allocator_type = typename Container::allocator_type;
36+
using reference = typename Container::reference;
37+
using const_reference = typename Container::const_reference;
38+
using pointer = typename Container::pointer;
39+
using const_pointer = typename Container::const_pointer;
40+
using iterator = typename Container::iterator;
41+
using const_iterator = typename Container::const_iterator;
42+
using reverse_iterator = typename Container::reverse_iterator;
4343
using const_reverse_iterator = typename Container::const_reverse_iterator;
4444
struct node_type
4545
{

‎flat_map/flat_map.hpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ class flat_map : private detail::_binary_flat_tree_base<flat_map<Key, T, Compare
3535
static constexpr range_order_t<range_order::unique_sorted> _order{};
3636

3737
public:
38-
using key_type = typename _super::key_type;
39-
using mapped_type = T;
40-
using value_type = typename _super::value_type;
41-
using size_type = typename _super::size_type;
42-
using difference_type = typename _super::difference_type;
43-
using key_compare = typename _super::key_compare;
44-
using allocator_type = typename _super::allocator_type;
45-
using reference = typename _super::reference;
46-
using const_reference = typename _super::const_reference;
47-
using pointer = typename _super::pointer;
48-
using const_pointer = typename _super::const_pointer;
49-
using iterator = typename _super::iterator;
50-
using const_iterator = typename _super::const_iterator;
51-
using reverse_iterator = typename _super::reverse_iterator;
38+
using key_type = typename _super::key_type;
39+
using mapped_type = T;
40+
using value_type = typename _super::value_type;
41+
using size_type = typename _super::size_type;
42+
using difference_type = typename _super::difference_type;
43+
using key_compare = typename _super::key_compare;
44+
using allocator_type = typename _super::allocator_type;
45+
using reference = typename _super::reference;
46+
using const_reference = typename _super::const_reference;
47+
using pointer = typename _super::pointer;
48+
using const_pointer = typename _super::const_pointer;
49+
using iterator = typename _super::iterator;
50+
using const_iterator = typename _super::const_iterator;
51+
using reverse_iterator = typename _super::reverse_iterator;
5252
using const_reverse_iterator = typename _super::const_reverse_iterator;
53-
using node_type = typename _super::node_type;
53+
using node_type = typename _super::node_type;
5454
struct value_compare
5555
{
5656
protected:

‎flat_map/flat_multimap.hpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class flat_multimap : private detail::_binary_flat_tree_base<flat_multimap<Key,
3333
static constexpr range_order_t<range_order::sorted> _order{};
3434

3535
public:
36-
using key_type = typename _super::key_type;
37-
using mapped_type = T;
38-
using value_type = typename _super::value_type;
39-
using size_type = typename _super::size_type;
40-
using difference_type = typename _super::difference_type;
41-
using key_compare = typename _super::key_compare;
42-
using allocator_type = typename _super::allocator_type;
43-
using reference = typename _super::reference;
44-
using const_reference = typename _super::const_reference;
45-
using pointer = typename _super::pointer;
46-
using const_pointer = typename _super::const_pointer;
47-
using iterator = typename _super::iterator;
48-
using const_iterator = typename _super::const_iterator;
49-
using reverse_iterator = typename _super::reverse_iterator;
36+
using key_type = typename _super::key_type;
37+
using mapped_type = T;
38+
using value_type = typename _super::value_type;
39+
using size_type = typename _super::size_type;
40+
using difference_type = typename _super::difference_type;
41+
using key_compare = typename _super::key_compare;
42+
using allocator_type = typename _super::allocator_type;
43+
using reference = typename _super::reference;
44+
using const_reference = typename _super::const_reference;
45+
using pointer = typename _super::pointer;
46+
using const_pointer = typename _super::const_pointer;
47+
using iterator = typename _super::iterator;
48+
using const_iterator = typename _super::const_iterator;
49+
using reverse_iterator = typename _super::reverse_iterator;
5050
using const_reverse_iterator = typename _super::const_reverse_iterator;
51-
using node_type = typename _super::node_type;
51+
using node_type = typename _super::node_type;
5252
struct value_compare
5353
{
5454
protected:

‎flat_map/flat_multiset.hpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class flat_multiset : private detail::_binary_flat_tree_base<flat_multiset<Key,
3333
static constexpr range_order_t<range_order::sorted> _order{};
3434

3535
public:
36-
using key_type = typename _super::key_type;
37-
using value_type = typename _super::value_type;
38-
using size_type = typename _super::size_type;
39-
using difference_type = typename _super::difference_type;
40-
using key_compare = typename _super::key_compare;
41-
using value_compare = key_compare;
42-
using allocator_type = typename _super::allocator_type;
43-
using reference = typename _super::reference;
44-
using const_reference = typename _super::const_reference;
45-
using pointer = typename _super::pointer;
46-
using const_pointer = typename _super::const_pointer;
47-
using iterator = typename _super::iterator;
48-
using const_iterator = typename _super::const_iterator;
49-
using reverse_iterator = typename _super::reverse_iterator;
36+
using key_type = typename _super::key_type;
37+
using value_type = typename _super::value_type;
38+
using size_type = typename _super::size_type;
39+
using difference_type = typename _super::difference_type;
40+
using key_compare = typename _super::key_compare;
41+
using value_compare = key_compare;
42+
using allocator_type = typename _super::allocator_type;
43+
using reference = typename _super::reference;
44+
using const_reference = typename _super::const_reference;
45+
using pointer = typename _super::pointer;
46+
using const_pointer = typename _super::const_pointer;
47+
using iterator = typename _super::iterator;
48+
using const_iterator = typename _super::const_iterator;
49+
using reverse_iterator = typename _super::reverse_iterator;
5050
using const_reverse_iterator = typename _super::const_reverse_iterator;
51-
using node_type = typename _super::node_type;
51+
using node_type = typename _super::node_type;
5252

5353
private:
5454
using _comparator = value_compare;

‎flat_map/flat_set.hpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ class flat_set : private detail::_binary_flat_tree_base<flat_set<Key, Compare, C
3333
static constexpr range_order_t<range_order::unique_sorted> _order{};
3434

3535
public:
36-
using key_type = typename _super::key_type;
37-
using value_type = typename _super::value_type;
38-
using size_type = typename _super::size_type;
39-
using difference_type = typename _super::difference_type;
40-
using key_compare = typename _super::key_compare;
41-
using value_compare = key_compare;
42-
using allocator_type = typename _super::allocator_type;
43-
using reference = typename _super::reference;
44-
using const_reference = typename _super::const_reference;
45-
using pointer = typename _super::pointer;
46-
using const_pointer = typename _super::const_pointer;
47-
using iterator = typename _super::iterator;
48-
using const_iterator = typename _super::const_iterator;
49-
using reverse_iterator = typename _super::reverse_iterator;
36+
using key_type = typename _super::key_type;
37+
using value_type = typename _super::value_type;
38+
using size_type = typename _super::size_type;
39+
using difference_type = typename _super::difference_type;
40+
using key_compare = typename _super::key_compare;
41+
using value_compare = key_compare;
42+
using allocator_type = typename _super::allocator_type;
43+
using reference = typename _super::reference;
44+
using const_reference = typename _super::const_reference;
45+
using pointer = typename _super::pointer;
46+
using const_pointer = typename _super::const_pointer;
47+
using iterator = typename _super::iterator;
48+
using const_iterator = typename _super::const_iterator;
49+
using reverse_iterator = typename _super::reverse_iterator;
5050
using const_reverse_iterator = typename _super::const_reverse_iterator;
51-
using node_type = typename _super::node_type;
52-
using insert_return_type = typename _super::insert_return_type;
51+
using node_type = typename _super::node_type;
52+
using insert_return_type = typename _super::insert_return_type;
5353

5454
private:
5555
using _comparator = value_compare;

‎flat_map/tied_sequence.hpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class zip_iterator
3434
std::tuple<Iterators...> _it;
3535

3636
public:
37-
using difference_type = std::ptrdiff_t;
38-
using value_type = tuple<typename std::iterator_traits<Iterators>::value_type...>;
39-
using pointer = tuple<typename std::iterator_traits<Iterators>::pointer...>;
40-
using reference = tuple<typename std::iterator_traits<Iterators>::reference...>;
37+
using difference_type = std::ptrdiff_t;
38+
using value_type = tuple<typename std::iterator_traits<Iterators>::value_type...>;
39+
using pointer = tuple<typename std::iterator_traits<Iterators>::pointer...>;
40+
using reference = tuple<typename std::iterator_traits<Iterators>::reference...>;
4141
using iterator_category = std::common_type_t<typename std::iterator_traits<Iterators>::iterator_category...>;
4242

4343
public:
@@ -191,11 +191,11 @@ class unzip_iterator
191191
Iterator _base;
192192

193193
public:
194-
using difference_type = typename std::iterator_traits<Iterator>::difference_type;
195-
using value_type = std::tuple_element_t<N, typename std::iterator_traits<Iterator>::value_type>;
196-
using pointer = detail::copy_cv_t<value_type, typename std::iterator_traits<Iterator>::pointer>*;
197-
// using reference = detail::copy_cv_t<value_type, std::remove_reference_t<typename std::iterator_traits<Iterator>::reference>>&;
198-
using reference = decltype(std::get<N>(*std::declval<Iterator>()));
194+
using difference_type = typename std::iterator_traits<Iterator>::difference_type;
195+
using value_type = std::tuple_element_t<N, typename std::iterator_traits<Iterator>::value_type>;
196+
using pointer = detail::copy_cv_t<value_type, typename std::iterator_traits<Iterator>::pointer>*;
197+
// using reference = detail::copy_cv_t<value_type, std::remove_reference_t<typename std::iterator_traits<Iterator>::reference>>&;
198+
using reference = decltype(std::get<N>(*std::declval<Iterator>()));
199199
using iterator_category = typename std::iterator_traits<Iterator>::iterator_category;
200200

201201
public:
@@ -281,17 +281,17 @@ class tied_sequence
281281
std::tuple<Sequences...> _seq;
282282

283283
public:
284-
using value_type = std::tuple<typename Sequences::value_type...>;
285-
using allocator_type = detail::fake_allocator<std::tuple<typename Sequences::allocator_type...>>;
286-
using size_type = std::size_t;
287-
using difference_type = std::ptrdiff_t;
288-
using reference = std::tuple<typename Sequences::reference...>;
289-
using const_reference = std::tuple<typename Sequences::const_reference...>;
290-
using pointer = std::tuple<typename Sequences::pointer...>;
291-
using const_pointer = std::tuple<typename Sequences::const_pointer...>;
292-
using iterator = detail::zip_iterator<typename Sequences::iterator...>;
293-
using const_iterator = detail::zip_iterator<typename Sequences::const_iterator...>;
294-
using reverse_iterator = std::reverse_iterator<iterator>;
284+
using value_type = std::tuple<typename Sequences::value_type...>;
285+
using allocator_type = detail::fake_allocator<std::tuple<typename Sequences::allocator_type...>>;
286+
using size_type = std::size_t;
287+
using difference_type = std::ptrdiff_t;
288+
using reference = std::tuple<typename Sequences::reference...>;
289+
using const_reference = std::tuple<typename Sequences::const_reference...>;
290+
using pointer = std::tuple<typename Sequences::pointer...>;
291+
using const_pointer = std::tuple<typename Sequences::const_pointer...>;
292+
using iterator = detail::zip_iterator<typename Sequences::iterator...>;
293+
using const_iterator = detail::zip_iterator<typename Sequences::const_iterator...>;
294+
using reverse_iterator = std::reverse_iterator<iterator>;
295295
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
296296

297297
private:

0 commit comments

Comments
 (0)