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

std_sstream.h (str()): the size of the current string may be different from the initial one whenever... 

2003-02-18  Paolo Carlini  <pcarlini@unitus.it>

	* include/std/std_sstream.h (str()): the size of the
	current string may be different from the initial one
	whenever _M_out_end > _M_out_beg.
	* testsuite/27_io/stringbuf_members.cc (test07): Add.

From-SVN: r63066
This commit is contained in:
Paolo Carlini 2003-02-19 00:26:32 +01:00 committed by Paolo Carlini
parent fcc11c35b7
commit de59bd27dc
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2003-02-18 Paolo Carlini <pcarlini@unitus.it>
* include/std/std_sstream.h (str()): the size of the
current string may be different from the initial one
whenever _M_out_end > _M_out_beg.
* testsuite/27_io/stringbuf_members.cc (test07): Add.
2003-02-18 Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/9582

2
libstdc++-v3/include/std/std_sstream.h
View File

@ -140,7 +140,7 @@ namespace std
// _M_string, and may not be the correct size of the
// current stringbuf internal buffer.
__size_type __len = _M_string.size();
if (this->_M_out_cur > this->_M_out_beg)
if (this->_M_out_end > this->_M_out_beg)
__len = std::max(__size_type(this->_M_out_end
- this->_M_out_beg), __len);
return __string_type(this->_M_out_beg, this->_M_out_beg + __len);

29
libstdc++-v3/testsuite/27_io/stringbuf_members.cc
View File

@ -1,6 +1,6 @@
// 981208 bkoz test functionality of basic_stringbuf for char_type == char
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -473,6 +473,32 @@ bool test06()
return test;
}
// http://gcc.gnu.org/ml/libstdc++/2003-02/msg00269.html
// Growing and then seeking to ios_base::beg triggered a bug in str(),
// which didn't notice the grow.
bool test07()
{
bool test = true;
std::stringbuf strb_01;
strb_01.sputc('s');
strb_01.pubseekoff(0, std::ios_base::beg);
VERIFY( strb_01.str() == "s" );
std::string str("strivi,");
std::stringbuf strb_02(str);
strb_02.pubseekoff(0, std::ios_base::end);
strb_02.sputn(" no better!", 11);
strb_02.pubseekoff(0, std::ios_base::beg);
VERIFY( strb_02.str() == "strivi, no better!" );
#ifdef DEBUG_ASSERT
assert(test);
#endif
return test;
}
int main()
{
test01();
@ -481,6 +507,7 @@ int main()
test04();
test05();
test06();
test07();
return 0;
}