From 74843551df5c70987eca1d7ac1c3320cc59a75f9 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 2 May 2003 02:14:49 +0200 Subject: [PATCH] sstream.tcc (overflow): Instead of calling str()... 2003-05-01 Paolo Carlini * 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 --- libstdc++-v3/ChangeLog | 7 +++++++ 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 cd55a6b5e01..60d51375596 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2003-05-01 Paolo Carlini + + * 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 * include/std/std_sstream.h (str()): Revert the best of the diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc index 11751783722..c09553127cc 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(_M_string.data()), this->_M_in_cur - this->_M_in_beg,