diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-07-13 18:22:51 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-07-13 18:22:51 +0100 |
| commit | 17f8dc9367493b5bd97d67c40de8c13041393891 (patch) | |
| tree | cb401255c1003fe03bbcb939acb15dbdf36ed76b | |
| parent | 260d92cd0d435f9f0869b25d84ce47f73d904b2f (diff) | |
| download | gcc-17f8dc9367493b5bd97d67c40de8c13041393891.zip gcc-17f8dc9367493b5bd97d67c40de8c13041393891.tar.gz gcc-17f8dc9367493b5bd97d67c40de8c13041393891.tar.bz2 | |
Make basic_string::replace forward to different overload
* include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI]
(replace(__const_iterator, __const_iterator, initializer_list<C>)):
Forward to different overload.
From-SVN: r238306
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f5246fe..a9e5b22 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-07-13 Jonathan Wakely <jwakely@redhat.com> + * include/bits/basic_string.h [_GLIBCXX_USE_CXX11_ABI] + (replace(__const_iterator, __const_iterator, initializer_list<C>)): + 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 374c985..60e1dbf 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: |