From: redi Date: Wed, 13 Jul 2016 17:22:51 +0000 (+0000) Subject: Make basic_string::replace forward to different overload X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58dbd9553a799e2213696cbe173e7dbe75736947;p=thirdparty%2Fgcc.git Make basic_string::replace forward to different overload * include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI] (replace(__const_iterator, __const_iterator, initializer_list)): Forward to different overload. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238306 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f5246fe05774..a9e5b22bfdab 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-07-13 Jonathan Wakely + * include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI] + (replace(__const_iterator, __const_iterator, initializer_list)): + Forward to different overload. + * include/bits/allocated_ptr.h (__allocated_ptr::_S_raw_ptr): Make static. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 374c9851539d..60e1dbfb5ccf 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -1912,7 +1912,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 */ basic_string& replace(const_iterator __i1, const_iterator __i2, initializer_list<_CharT> __l) - { return this->replace(__i1, __i2, __l.begin(), __l.end()); } + { return this->replace(__i1, __i2, __l.begin(), __l.size()); } #endif // C++11 private: