diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-06-21 23:01:25 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-06-21 23:01:25 +0100 |
| commit | cda121ac7a50e53faa61f282f6ef21b58fe8e7fd (patch) | |
| tree | eca3dd7424fe9f58436af970b91afff468a6e0c2 /libstdc++-v3/configure | |
| parent | 5cfd86209522dac51933a7d3c92135f392b16131 (diff) | |
| download | gcc-cda121ac7a50e53faa61f282f6ef21b58fe8e7fd.zip gcc-cda121ac7a50e53faa61f282f6ef21b58fe8e7fd.tar.gz gcc-cda121ac7a50e53faa61f282f6ef21b58fe8e7fd.tar.bz2 | |
PR libstdc++/83328 add correct basic_string::insert for initializer_list
The SSO basic_string has a non-standard insert(iterator, initializer_list)
overload, from a C++0x draft. This adds the correct overload, while also
preserving the old one so that the old symbol is still exported from the
library.
The COW basic_string doesn't have any of the C++11 changes to the insert
overloads (they all still have non-const iterator parameters and the
ones that should return an iterator still return void). This doesn't
make any change to the COW string.
PR libstdc++/83328
* acinclude.m4 (libtool_VERSION): Bump to 6:26:0.
* config/abi/pre/gnu.ver: Add GLIBCXX_3.4.26 and export new symbol.
* configure: Regenerate.
* include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI]
(basic_string::insert(const_iterator, initializer_list<C>)): Add.
[_GLIBCXX_USE_CXX11_ABI && !_GLIBCXX_DEFINING_STRING_INSTANTIATIONS]
(basic_string::insert(iterator, initializer_list<C>)): Suppress
definition.
* include/debug/string (basic_string::insert(iterator, C)): Change
first parameter to const_iterator.
(basic_string::insert(iterator, size_type, C)): Likewise. Change
return type to iterator.
(basic_string::insert(iterator, InputIterator, InputIterator)):
Likewise.
(basic_string::insert(iterator, initializer_list<C>)): Change first
parameter to const_iterator and return type to iterator.
* src/c++11/string-inst.cc: Extend comment.
* testsuite/21_strings/basic_string/modifiers/insert/char/83328.cc:
New.
* testsuite/21_strings/basic_string/modifiers/insert/wchar_t/83328.cc:
New.
* testsuite/util/testsuite_abi.cc: Add new symbol version.
From-SVN: r261866
Diffstat (limited to 'libstdc++-v3/configure')
| -rwxr-xr-x | libstdc++-v3/configure | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 5a017be..d126add 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -79187,7 +79187,7 @@ $as_echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;} fi # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:25:0 +libtool_VERSION=6:26:0 # Everything parsed; figure out what files and settings to use. case $enable_symvers in |