diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/26_numerics/complex/inserters_extractors/char/dr2714.cc (renamed from libstdc++-v3/testsuite/26_numerics/complex/dr2714.cc) | 20 |
2 files changed, 10 insertions, 17 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e4e435d..b20a277 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2017-12-14 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/26_numerics/complex/dr2714.cc: Move to ... + * testsuite/26_numerics/complex/inserters_extractors/char/dr2714.cc: + ... Here. Remove duplicate header and dg-options. Check first invalid + character gets putback. Remove wchar_t test. + 2017-12-13 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/59568 diff --git a/libstdc++-v3/testsuite/26_numerics/complex/dr2714.cc b/libstdc++-v3/testsuite/26_numerics/complex/inserters_extractors/char/dr2714.cc index 6b35e8a..17fb8a2 100644 --- a/libstdc++-v3/testsuite/26_numerics/complex/dr2714.cc +++ b/libstdc++-v3/testsuite/26_numerics/complex/inserters_extractors/char/dr2714.cc @@ -15,11 +15,8 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-options "-std=gnu++98" } - #include <complex> #include <sstream> -#include <complex> #include <testsuite_hooks.h> void @@ -37,16 +34,6 @@ test01() void test02() { - std::wistringstream in(L" ( 2.0 , 0.5 ) "); - std::complex<double> c; - in >> c; - VERIFY( in.good() ); - VERIFY( c.real() == 2.0 && c.imag() == 0.5 ); -} - -void -test03() -{ std::istringstream in; std::complex<double> c(-1, -1); const std::complex<double> c0 = c; @@ -55,6 +42,7 @@ test03() in >> c; VERIFY( in.fail() ); in.clear(); + VERIFY( in.get() == 'a' ); in.str(" ( ) "); in >> c; @@ -71,11 +59,10 @@ test03() in.str("(b)"); in >> c; VERIFY( in.fail() ); - in.clear(); VERIFY( in.get() == 'b' ); - in.str("( c)"); + in.str("( c)"); in >> c; VERIFY( in.fail() ); in.clear(); @@ -121,7 +108,7 @@ test03() } void -test04() +test03() { // PR libstdc++/59568 std::istringstream in; @@ -164,5 +151,4 @@ main() test01(); test02(); test03(); - test04(); } |