From 7198e982e9418260df8da4579447f141515a805e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 14 May 2019 13:19:10 +0100 Subject: [PATCH] Removing unused, non-standard function in _Rb_tree * include/bits/stl_tree.h (_Rb_tree::erase(const Key*, const Key*)): Remove unused, non-standard function. From-SVN: r271168 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/bits/stl_tree.h | 13 +------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3cfcd0623c1..808af37a374 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-05-14 Jonathan Wakely + * include/bits/stl_tree.h (_Rb_tree::erase(const Key*, const Key*)): + Remove unused, non-standard function. + * include/bits/regex.h (match_results::max_size()): Adjust return value to account for prefix/suffix/unmatched subs. (match_results::_M_resize(unsigned int)): Use _Base_type::assign to diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 7545ade3f7b..00e4a0cccbf 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -1231,6 +1231,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_erase_aux(__position); } #endif + size_type erase(const key_type& __x); @@ -1253,8 +1254,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION erase(const_iterator __first, const_iterator __last) { _M_erase_aux(__first, __last); } #endif - void - erase(const key_type* __first, const key_type* __last); void clear() _GLIBCXX_NOEXCEPT @@ -2533,16 +2532,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __old_size - size(); } - template - void - _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: - erase(const _Key* __first, const _Key* __last) - { - while (__first != __last) - erase(*__first++); - } - template typename _Rb_tree<_Key, _Val, _KeyOfValue, -- 2.30.2