summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2011-03-25 22:50:47 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2011-03-25 22:50:47 +0000
commit533909c019abfdaf1d308b0cf605308bea9bc23f (patch)
treea57d377ce4e66f0a3aef8d5c6a734706893f1106
parent5c13bd80a30775ccf2b81ddd49dcb1b328801c96 (diff)
downloadgcc-533909c019abfdaf1d308b0cf605308bea9bc23f.tar.gz
2011-03-25 Jonathan Wakely <jwakely.gcc@gmail.com>
* testsuite/28_regex/match_results/ctors/char/default.cc: Do not call members which require a fully established result state. * testsuite/28_regex/match_results/ctors/wchar_t/default.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171530 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc12
-rw-r--r--libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc12
3 files changed, 18 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2facd17af70..e7cfb3240f7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-25 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * testsuite/28_regex/match_results/ctors/char/default.cc: Do not call
+ members which require a fully established result state.
+ * testsuite/28_regex/match_results/ctors/wchar_t/default.cc: Likewise.
+
2011-03-25 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/random.h (negative_binomial_distribution<>::
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc b/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc
index 4c897d7a4a0..bdf7d984c6f 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc
@@ -2,7 +2,7 @@
// 2009-06-10 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,18 +29,18 @@ void test01()
{
bool test __attribute__((unused)) = true;
- std::cmatch cm;
+ std::cmatch cm;
VERIFY( cm.size() == 0 );
- VERIFY( cm.str() == std::cmatch::string_type() );
+ VERIFY( !cm.ready() );
}
void test02()
{
bool test __attribute__((unused)) = true;
- std::smatch sm;
+ std::smatch sm;
VERIFY( sm.size() == 0 );
- VERIFY( sm.str() == std::smatch::string_type() );
+ VERIFY( !sm.ready() );
}
int
@@ -49,4 +49,4 @@ main()
test01();
test02();
return 0;
-};
+}
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc b/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc
index f8b3d45e867..f797cab2744 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc
@@ -2,7 +2,7 @@
// 2009-06-05 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,18 +29,18 @@ void test01()
{
bool test __attribute__((unused)) = true;
- std::wcmatch cm;
+ std::wcmatch cm;
VERIFY( cm.size() == 0 );
- VERIFY( cm.str() == std::wcmatch::string_type() );
+ VERIFY( !cm.ready() );
}
void test02()
{
bool test __attribute__((unused)) = true;
- std::wsmatch sm;
+ std::wsmatch sm;
VERIFY( sm.size() == 0 );
- VERIFY( sm.str() == std::wsmatch::string_type() );
+ VERIFY( !sm.ready() );
}
int
@@ -49,4 +49,4 @@ main()
test01();
test02();
return 0;
-};
+}