diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2facd17af70c..e7cfb3240f7e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-03-25 Jonathan Wakely + + * 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 * 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 4c897d7a4a0d..bdf7d984c6f8 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 // -// 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 f8b3d45e867f..f797cab2744b 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 // -// 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; -}; +}