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

libstdc++-v3/ChangeLog

+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.

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()

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()