locale.cc (locale::_S_initialize): Workaround a confusion of the use of the gthr...

2003-10-14  Petur Runolfsson  <peturr02@ru.is>
	    Andreas Tobler  <a.tobler@schweiz.ch>

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

Co-Authored-By: Andreas Tobler <a.tobler@schweiz.ch>
From-SVN: r72458

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 58111229429b442c6469e7bd28068592253c4756..d024c0e59cd8bf505570c2715310cfeae970a127 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-14  Petur Runolfsson  <peturr02@ru.is>
+           Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * src/locale.cc (locale::_S_initialize): Workaround a confusion
+       of the use of the gthr API when __gthread_active_p() returns true.
+
 2003-10-12  Petur Runolfsson  <peturr02@ru.is>
            Paolo Carlini  <pcarlini@unitus.it>
 

diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index f5b36044e581a00ac02b4cb9b7132c2c219bd349..baa5a4183d77363e992155ac4ea214e1a30c1f28 100644 (file)
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -395,12 +395,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();
   }
 
   void