From: Petur Runolfsson <peturr02@ru.is>
Date: Tue, 14 Oct 2003 04:47:10 +0000 (+0000)
Subject: locale.cc (locale::_S_initialize): Workaround a confusion of the use of the gthr... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9dccaa6bb6721b80b4c0d51833ba1593799ee867;p=gcc.git

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

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 58111229429..d024c0e59cd 100644
--- 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 f5b36044e58..baa5a4183d7 100644
--- 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