diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-09-29 14:31:51 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-09-29 14:31:51 +0100 |
| commit | b59882293f2283335b565047de33c8fd8146686c (patch) | |
| tree | e327612ccbae09d82d0361093a42061e788b5e5a | |
| parent | e7cbc0960edec3d2ce1edf00b6c536a6f2faca33 (diff) | |
| download | gcc-b59882293f2283335b565047de33c8fd8146686c.zip gcc-b59882293f2283335b565047de33c8fd8146686c.tar.gz gcc-b59882293f2283335b565047de33c8fd8146686c.tar.bz2 | |
PR libstdc++/67583 Fix invalid sputn calls in tests
PR libstdc++/67583
* testsuite/27_io/basic_stringbuf/seekoff/char/1.cc: Fix sputn call
with mismatched arguments.
* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc: Likewise.
From-SVN: r228245
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ad951e2..4408e46 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2015-09-29 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/67583 + * testsuite/27_io/basic_stringbuf/seekoff/char/1.cc: Fix sputn call + with mismatched arguments. + * testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc: Likewise. + PR libstdc++/65393 * config/abi/pre/gnu.ver: Export new symbols. * include/std/thread (thread::_State, thread::_State_impl): New types. diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc index ddc6d97..2cd7696 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc @@ -88,8 +88,10 @@ void test04() VERIFY( strmsz_2 != strmsz_1 ); VERIFY( strmsz_2 == 1 ); // end part three + str_tmp = " ravi shankar meets carlos santana in LoHa "; + str_tmp += str_tmp; strmsz_1 = strb_01.str().size(); - strmsz_2 = strb_01.sputn(" ravi shankar meets carlos santana in LoHa", 90); + strmsz_2 = strb_01.sputn(str_tmp.c_str(), str_tmp.size()); strb_01.pubseekoff(0, std::ios_base::end); strb_01.sputc('<'); str_tmp = strb_01.str(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc index 8678536..0dd0974 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc @@ -88,8 +88,10 @@ void test04() VERIFY( strmsz_2 != strmsz_1 ); VERIFY( strmsz_2 == 1 ); // end part three + str_tmp = L" ravi shankar meets carlos santana in LoHa "; + str_tmp += str_tmp; strmsz_1 = strb_01.str().size(); - strmsz_2 = strb_01.sputn(L" ravi shankar meets carlos santana in LoHa", 90); + strmsz_2 = strb_01.sputn(str_tmp.c_str(), str_tmp.size()); strb_01.pubseekoff(0, std::ios_base::end); strb_01.sputc(L'<'); str_tmp = strb_01.str(); |