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

Fix C++11-ism in C++98 member function 

* include/debug/string (insert(__const_iterator, _InIter, _InIter)):
	[!_GLIBCXX_USE_CXX11_ABI]: Replace use of C++11-only cbegin() with
	begin(), for C++98 compatibility.

From-SVN: r263809
This commit is contained in:
Jonathan Wakely 2018-08-23 12:21:17 +01:00 committed by Jonathan Wakely
parent 3eb1eda1c8
commit 21bf6b2a93
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,9 @@
2018-08-23 Jonathan Wakely <jwakely@redhat.com>
* include/debug/string (insert(__const_iterator, _InIter, _InIter)):
[!_GLIBCXX_USE_CXX11_ABI]: Replace use of C++11-only cbegin() with
begin(), for C++98 compatibility.
* include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI]
(basic_string::__const_iterator): Change access to protected.
[!_GLIBCXX_USE_CXX11_ABI] (basic_string::__const_iterator): Define

2
libstdc++-v3/include/debug/string
View File

@ -642,7 +642,7 @@ namespace __gnu_debug
else
__res = _Base::insert(__p.base(), __first, __last);
#else
const size_type __offset = __p.base() - _Base::cbegin();
const size_type __offset = __p.base() - _Base::begin();
_Base::insert(__p.base(), __first, __last);
__res = _Base::begin() + __offset;
#endif