diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-02-17 08:38:11 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-02-17 08:38:11 +0000 |
| commit | 11514ce0fbb4ac3a9ef4c651ef22869c89899ed2 (patch) | |
| tree | baa2d320152ddb41c894f5f757a6a31165df9421 | |
| parent | fbf4bfd3f32b35e91dcfec0d3143c710e1b17638 (diff) | |
| download | gcc-11514ce0fbb4ac3a9ef4c651ef22869c89899ed2.zip gcc-11514ce0fbb4ac3a9ef4c651ef22869c89899ed2.tar.gz gcc-11514ce0fbb4ac3a9ef4c651ef22869c89899ed2.tar.bz2 | |
re PR libstdc++/47776 (New libstc++ test failures)
2011-02-17 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/47776
* testsuite/ext/vstring/hash/char/1.cc: Fix.
* testsuite/ext/vstring/hash/wchar_t/1.cc: Likewise.
From-SVN: r170242
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc | 17 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc | 17 |
3 files changed, 22 insertions, 18 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5b10328..525cf7d5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-02-17 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/47776 + * testsuite/ext/vstring/hash/char/1.cc: Fix. + * testsuite/ext/vstring/hash/wchar_t/1.cc: Likewise. + 2011-02-17 Jonathan Wakely <jwakely.gcc@gmail.com> * include/bits/regex.h (basic_regex::traits_type): Add typedef. diff --git a/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc b/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc index 52140fc..db0bc03 100644 --- a/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc +++ b/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc @@ -37,15 +37,14 @@ void test01() VERIFY( mymap.size() == 2 ); - map_t::const_iterator imap = mymap.begin(); - - VERIFY( vstring_t(imap->first.c_str()) == "hi" ); - VERIFY( imap->second == 20 ); - - ++imap; - - VERIFY( vstring_t(imap->first.c_str()) == "hello" ); - VERIFY( imap->second == 10 ); + map_t::const_iterator imap1 = mymap.begin(); + map_t::const_iterator imap2 = mymap.begin(); + ++imap2; + + VERIFY( ((imap1->first == "hello" && imap1->second == 10 + && imap2->first == "hi" && imap2->second == 20) + || (imap1->first == "hi" && imap1->second == 20 + && imap2->first == "hello" && imap2->second == 10)) ); } int main() diff --git a/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc b/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc index a5339d1..83edbe11a 100644 --- a/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc @@ -37,15 +37,14 @@ void test01() VERIFY( mymap.size() == 2 ); - map_t::const_iterator imap = mymap.begin(); - - VERIFY( vstring_t(imap->first.c_str()) == L"hi" ); - VERIFY( imap->second == 20 ); - - ++imap; - - VERIFY( vstring_t(imap->first.c_str()) == L"hello" ); - VERIFY( imap->second == 10 ); + map_t::const_iterator imap1 = mymap.begin(); + map_t::const_iterator imap2 = mymap.begin(); + ++imap2; + + VERIFY( ((imap1->first == L"hello" && imap1->second == 10 + && imap2->first == L"hi" && imap2->second == 20) + || (imap1->first == L"hi" && imap1->second == 20 + && imap2->first == L"hello" && imap2->second == 10)) ); } int main() |