OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

list (list<>::cbegin()): Use C++11 direct initialization. 

2018-10-08  François Dumont  <fdumont@gcc.gnu.org>

	* include/debug/list (list<>::cbegin()): Use C++11 direct
	initialization.
	(list<>::cend()): Likewise.
	(list<>::emplace<>(const_iterator, _Args&&...)): Likewise.
	(list<>::insert(const_iterator, initializer_list<>)): Likewise.
	(list<>::insert(const_iterator, size_type, const _Tp&)): Likewise.
	(list<>::erase(const_iterator, const_iterator)): Ensure consistent
	iterator comparisons.
	(list<>::splice(const_iterator, list&&, const_iterator,
	const_iterator)): Likewise.

From-SVN: r264911
This commit is contained in:
François Dumont 2018-10-08 05:49:12 +00:00
parent c0485831b7
commit edec2bad9a
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,16 @@
2018-10-08 François Dumont <fdumont@gcc.gnu.org>
* include/debug/list (list<>::cbegin()): Use C++11 direct
initialization.
(list<>::cend()): Likewise.
(list<>::emplace<>(const_iterator, _Args&&...)): Likewise.
(list<>::insert(const_iterator, initializer_list<>)): Likewise.
(list<>::insert(const_iterator, size_type, const _Tp&)): Likewise.
(list<>::erase(const_iterator, const_iterator)): Ensure consistent
iterator comparisons.
(list<>::splice(const_iterator, list&&, const_iterator,
const_iterator)): Likewise.
2018-10-05 François Dumont <fdumont@gcc.gnu.org> 2018-10-05 François Dumont <fdumont@gcc.gnu.org>
* include/bits/stl_tree.h * include/bits/stl_tree.h

40
libstdc++-v3/include/debug/list
View File

@ -244,11 +244,11 @@ namespace __debug
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
const_iterator const_iterator
cbegin() const noexcept cbegin() const noexcept
{ return const_iterator(_Base::begin(), this); } { return { _Base::begin(), this }; }
const_iterator const_iterator
cend() const noexcept cend() const noexcept
{ return const_iterator(_Base::end(), this); } { return { _Base::end(), this }; }
const_reverse_iterator const_reverse_iterator
crbegin() const noexcept crbegin() const noexcept
@ -405,8 +405,8 @@ namespace __debug
emplace(const_iterator __position, _Args&&... __args) emplace(const_iterator __position, _Args&&... __args)
{ {
__glibcxx_check_insert(__position); __glibcxx_check_insert(__position);
return iterator(_Base::emplace(__position.base(), return { _Base::emplace(__position.base(),
std::forward<_Args>(__args)...), this); std::forward<_Args>(__args)...), this };
} }
#endif #endif
@ -430,7 +430,7 @@ namespace __debug
insert(const_iterator __p, initializer_list<value_type> __l) insert(const_iterator __p, initializer_list<value_type> __l)
{ {
__glibcxx_check_insert(__p); __glibcxx_check_insert(__p);
return iterator(_Base::insert(__p.base(), __l), this); return { _Base::insert(__p.base(), __l), this };
} }
#endif #endif
@ -439,7 +439,7 @@ namespace __debug
insert(const_iterator __position, size_type __n, const _Tp& __x) insert(const_iterator __position, size_type __n, const _Tp& __x)
{ {
__glibcxx_check_insert(__position); __glibcxx_check_insert(__position);
return iterator(_Base::insert(__position.base(), __n, __x), this); return { _Base::insert(__position.base(), __n, __x), this };
} }
#else #else
void void
@ -465,7 +465,7 @@ namespace __debug
_Base::insert(__position.base(), _Base::insert(__position.base(),
__gnu_debug::__unsafe(__first), __gnu_debug::__unsafe(__first),
__gnu_debug::__unsafe(__last)), __gnu_debug::__unsafe(__last)),
this this
}; };
else else
return { _Base::insert(__position.base(), __first, __last), this }; return { _Base::insert(__position.base(), __first, __last), this };
@ -521,15 +521,17 @@ namespace __debug
// _GLIBCXX_RESOLVE_LIB_DEFECTS // _GLIBCXX_RESOLVE_LIB_DEFECTS
// 151. can't currently clear() empty container // 151. can't currently clear() empty container
__glibcxx_check_erase_range(__first, __last); __glibcxx_check_erase_range(__first, __last);
for (_Base_const_iterator __victim = __first.base(); for (__decltype(__first.base()) __victim = __first.base();
__victim != __last.base(); ++__victim) __victim != __last.base(); ++__victim)
{ {
_GLIBCXX_DEBUG_VERIFY(__victim != _Base::end(), _GLIBCXX_DEBUG_VERIFY(
_M_message(__gnu_debug::__msg_valid_range) __victim != __first._M_get_sequence()->_M_base().end(),
._M_iterator(__first, "position") _M_message(__gnu_debug::__msg_valid_range)
._M_iterator(__last, "last")); ._M_iterator(__first, "position")
._M_iterator(__last, "last"));
this->_M_invalidate_if(_Equal(__victim)); this->_M_invalidate_if(_Equal(__victim));
} }
return iterator(_Base::erase(__first.base(), __last.base()), this); return iterator(_Base::erase(__first.base(), __last.base()), this);
} }
@ -586,7 +588,7 @@ namespace __debug
._M_iterator(__i, "__i")); ._M_iterator(__i, "__i"));
_GLIBCXX_DEBUG_VERIFY(__i._M_attached_to(std::__addressof(__x)), _GLIBCXX_DEBUG_VERIFY(__i._M_attached_to(std::__addressof(__x)),
_M_message(__gnu_debug::__msg_splice_other) _M_message(__gnu_debug::__msg_splice_other)
._M_iterator(__i, "__i")._M_sequence(__x, "__x")); ._M_iterator(__i, "__i")._M_sequence(__x, "__x"));
// _GLIBCXX_RESOLVE_LIB_DEFECTS // _GLIBCXX_RESOLVE_LIB_DEFECTS
// 250. splicing invalidates iterators // 250. splicing invalidates iterators
@ -620,19 +622,21 @@ namespace __debug
// We used to perform the splice_alloc check: not anymore, redundant // We used to perform the splice_alloc check: not anymore, redundant
// after implementing the relevant bits of N1599. // after implementing the relevant bits of N1599.
for (_Base_const_iterator __tmp = __first.base(); for (__decltype(__first.base()) __tmp = __first.base();
__tmp != __last.base(); ++__tmp) __tmp != __last.base(); ++__tmp)
{ {
_GLIBCXX_DEBUG_VERIFY(__tmp != _Base::end(), _GLIBCXX_DEBUG_VERIFY(
_M_message(__gnu_debug::__msg_valid_range) __tmp != __first._M_get_sequence()->_M_base().end(),
._M_iterator(__first, "first") _M_message(__gnu_debug::__msg_valid_range)
._M_iterator(__last, "last")); ._M_iterator(__first, "first")
._M_iterator(__last, "last"));
_GLIBCXX_DEBUG_VERIFY(std::__addressof(__x) != this _GLIBCXX_DEBUG_VERIFY(std::__addressof(__x) != this
|| __tmp != __position.base(), || __tmp != __position.base(),
_M_message(__gnu_debug::__msg_splice_overlap) _M_message(__gnu_debug::__msg_splice_overlap)
._M_iterator(__tmp, "position") ._M_iterator(__tmp, "position")
._M_iterator(__first, "first") ._M_iterator(__first, "first")
._M_iterator(__last, "last")); ._M_iterator(__last, "last"));
// _GLIBCXX_RESOLVE_LIB_DEFECTS // _GLIBCXX_RESOLVE_LIB_DEFECTS
// 250. splicing invalidates iterators // 250. splicing invalidates iterators
this->_M_transfer_from_if(__x, _Equal(__tmp)); this->_M_transfer_from_if(__x, _Equal(__tmp));