diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2003-05-02 02:14:49 +0200 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-05-02 00:14:49 +0000 |
| commit | 74843551df5c70987eca1d7ac1c3320cc59a75f9 (patch) | |
| tree | 587ab455dc5c8464dd95e9b8a0d8249079ed690b | |
| parent | e70b1b7788ab76c22634d4e0e3d65ab7e55d667a (diff) | |
| download | gcc-74843551df5c70987eca1d7ac1c3320cc59a75f9.zip gcc-74843551df5c70987eca1d7ac1c3320cc59a75f9.tar.gz gcc-74843551df5c70987eca1d7ac1c3320cc59a75f9.tar.bz2 | |
sstream.tcc (overflow): Instead of calling str()...
2003-05-01 Paolo Carlini <pcarlini@unitus.it>
* include/bits/sstream.tcc (overflow): Instead of calling
str(), then _M_string.reserve, thus copying the contents
of the current buffer two times, just copy the latter in
a temporary, then use the 'swap trick'.
From-SVN: r66358
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/sstream.tcc | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cd55a6b..60d5137 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2003-05-01 Paolo Carlini <pcarlini@unitus.it> + * include/bits/sstream.tcc (overflow): Instead of calling + str(), then _M_string.reserve, thus copying the contents + of the current buffer two times, just copy the latter in + a temporary, then use the 'swap trick'. + +2003-05-01 Paolo Carlini <pcarlini@unitus.it> + * include/std/std_sstream.h (str()): Revert the best of the previous 'improvement', incorrect due to the COW nature of v3 basic_string; simplify. diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc index 1175178..c095531 100644 --- a/libstdc++-v3/include/bits/sstream.tcc +++ b/libstdc++-v3/include/bits/sstream.tcc @@ -100,11 +100,15 @@ namespace std // Order these tests done in is unspecified by the standard. if (!__testput) { - // Force-allocate, re-sync. - _M_string = this->str(); // In virtue of DR 169 (TC) we are allowed to grow more than // one char. That's easy to implement thanks to the exponential // growth policy builtin into basic_string. + __string_type __tmp; + __tmp.reserve(__len); + __tmp.assign(_M_string.data(), + this->_M_out_end - this->_M_out_beg); + _M_string.swap(__tmp); + // Just to be sure... _M_string.reserve(__len); _M_really_sync(const_cast<char_type*>(_M_string.data()), this->_M_in_cur - this->_M_in_beg, |