locale.cc (locale::_S_initialize): Re-apply workaround a confusion of the use of...

2003-10-18  Andreas Tobler  <a.tobler@schweiz.ch>

	* src/locale.cc (locale::_S_initialize): Re-apply workaround a
	confusion of the use of the gthr API when __gthread_active_p()
	returns true.

From-SVN: r72679

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 64d19da7c073bd3ae9186f673a3d546957d60fe7..be527fa5162cc32d92114e77a3dfbe2fffeb3838 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-18  Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * src/locale.cc (locale::_S_initialize): Re-apply workaround a
+       confusion of the use of the gthr API when __gthread_active_p()
+       returns true.
+
 2003-10-17  Benjamin Kosnik  <bkoz@redhat.com>
  
        * src/Makefile.am: Add new files.

diff --git a/libstdc++-v3/src/locale_init.cc b/libstdc++-v3/src/locale_init.cc
index 1273b2a4422d33a5332212683222d1e55d794fb5..99bfe3e84cabb08608cb0fc5fd321f6fc4f58e20 100644 (file)
--- a/libstdc++-v3/src/locale_init.cc
+++ b/libstdc++-v3/src/locale_init.cc
@@ -143,12 +143,9 @@ namespace std
 #ifdef __GTHREADS
     if (__gthread_active_p())
       __gthread_once(&_S_once, _S_initialize_once);
-    else
 #endif
-      {
-       if (!_S_classic)
-         _S_initialize_once();
-      }
+    if (!_S_classic)
+      _S_initialize_once();
   }
 
   // Definitions for static const data members of locale::_Impl