12658_thread-1.cc, [...]: Use __gnu_test::try_named_locale.

2004-07-14  Paolo Carlini  <pcarlini@suse.de>

	* testsuite/22_locale/locale/cons/12658_thread-1.cc, 12658_thread-2.cc:
	Use __gnu_test::try_named_locale.

From-SVN: r84687

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d55a4704e6bf7692ba1b87d438eb67f705325e6c..a4c2ccc0a9035b2acdb7c80da222e7296c9409ed 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-14  Paolo Carlini  <pcarlini@suse.de>
+
+       * testsuite/22_locale/locale/cons/12658_thread-1.cc,
+       12658_thread-2.cc: Use __gnu_test::try_named_locale.
+
 2004-07-13  Benjamin Kosnik  <bkoz@redhat.com>
 
        * docs/html/ext/mt_allocator.html: Add docs for _Tune.

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
index 8c39b505cba897ae1dc1e1413cecadc98bbbf26e..216d068f8706fdd98edf64db27ce1983d6d840c9 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
@@ -26,7 +26,8 @@
 
 #include <locale>
 #include <pthread.h>
- 
+#include <testsuite_hooks.h>
+
 const int max_thread_count = 20;
 //const int max_loop_count = 1000000; // orig value
 const int max_loop_count = 100000;
@@ -39,7 +40,7 @@ void* thread_main(void*)
       std::locale loc_c = std::locale::classic();
       std::locale loc[max_locales];
       for (int j = 0; j < max_locales; ++j)
-       loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");
+       loc[j] = __gnu_test::try_named_locale(j % 2 ? "en_US" : "fr_FR");
       
       for (int i = 0; i < max_loop_count; ++i)
        {

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc
index 064a9b99473ee4cd5459b2eb3854977bc2e618cf..a48c4a85f0da6aa186d8f1ffb8566e11bc954cd9 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc
@@ -24,7 +24,8 @@
 
 #include <locale>
 #include <pthread.h>
- 
+#include <testsuite_hooks.h>
+
 const int max_thread_count = 20;
 //const int max_loop_count = 1000000; // orig value
 const int max_loop_count = 100000;
@@ -51,7 +52,7 @@ main()
   pthread_t tid[max_thread_count];
   
   for (int j = 0; j < max_locales; ++j)
-    loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");  
+    loc[j] = __gnu_test::try_named_locale(j % 2 ? "en_US" : "fr_FR");  
 
   for (int i = 0; i < max_thread_count; i++)
     pthread_create(&tid[i], NULL, thread_main, 0);