Skip to content

Commit 507de4e

Browse files
cf
1 parent b7095a0 commit 507de4e

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

libcxx/include/__tree

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -582,11 +582,10 @@ class _LIBCPP_STANDALONE_DEBUG __tree_node : public __tree_node_base<_VoidPtr> {
582582
public:
583583
using __node_value_type _LIBCPP_NODEBUG = __get_node_value_type_t<_Tp>;
584584

585-
private:
585+
private:
586586
__node_value_type __value_;
587587

588-
public:
589-
588+
public:
590589
_LIBCPP_HIDE_FROM_ABI __node_value_type& __get_value() { return __value_; }
591590

592591
~__tree_node() = delete;
@@ -654,7 +653,9 @@ public:
654653
_LIBCPP_HIDE_FROM_ABI __tree_iterator() _NOEXCEPT : __ptr_(nullptr) {}
655654

656655
_LIBCPP_HIDE_FROM_ABI reference operator*() const { return __get_np()->__get_value(); }
657-
_LIBCPP_HIDE_FROM_ABI pointer operator->() const { return pointer_traits<pointer>::pointer_to(__get_np()->__get_value()); }
656+
_LIBCPP_HIDE_FROM_ABI pointer operator->() const {
657+
return pointer_traits<pointer>::pointer_to(__get_np()->__get_value());
658+
}
658659

659660
_LIBCPP_HIDE_FROM_ABI __tree_iterator& operator++() {
660661
__ptr_ = std::__tree_next_iter<__end_node_pointer>(static_cast<__node_base_pointer>(__ptr_));
@@ -716,7 +717,9 @@ public:
716717
_LIBCPP_HIDE_FROM_ABI __tree_const_iterator(__non_const_iterator __p) _NOEXCEPT : __ptr_(__p.__ptr_) {}
717718

718719
_LIBCPP_HIDE_FROM_ABI reference operator*() const { return __get_np()->__get_value(); }
719-
_LIBCPP_HIDE_FROM_ABI pointer operator->() const { return pointer_traits<pointer>::pointer_to(__get_np()->__get_value()); }
720+
_LIBCPP_HIDE_FROM_ABI pointer operator->() const {
721+
return pointer_traits<pointer>::pointer_to(__get_np()->__get_value());
722+
}
720723

721724
_LIBCPP_HIDE_FROM_ABI __tree_const_iterator& operator++() {
722725
__ptr_ = std::__tree_next_iter<__end_node_pointer>(static_cast<__node_base_pointer>(__ptr_));

libcxx/include/map

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,8 @@ map<_Key, _Tp, _Compare, _Allocator>::map(map&& __m, const allocator_type& __a)
13891389
if (__a != __m.get_allocator()) {
13901390
const_iterator __e = cend();
13911391
while (!__m.empty()) {
1392-
__tree_.__insert_unique_from_orphaned_node(__e.__i_, std::move(__m.__tree_.remove(__m.begin().__i_)->__get_value()));
1392+
__tree_.__insert_unique_from_orphaned_node(
1393+
__e.__i_, std::move(__m.__tree_.remove(__m.begin().__i_)->__get_value()));
13931394
}
13941395
}
13951396
}
@@ -1959,7 +1960,8 @@ multimap<_Key, _Tp, _Compare, _Allocator>::multimap(multimap&& __m, const alloca
19591960
if (__a != __m.get_allocator()) {
19601961
const_iterator __e = cend();
19611962
while (!__m.empty())
1962-
__tree_.__insert_multi_from_orphaned_node(__e.__i_, std::move(__m.__tree_.remove(__m.begin().__i_)->__get_value()));
1963+
__tree_.__insert_multi_from_orphaned_node(
1964+
__e.__i_, std::move(__m.__tree_.remove(__m.begin().__i_)->__get_value()));
19631965
}
19641966
}
19651967
# endif

0 commit comments

Comments
 (0)