aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorAndreas Tobler <a.tobler@schweiz.ch>2003-10-19 19:43:44 +0200
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2003-10-19 17:43:44 +0000
commit8f4c7b679cee153ac12b9d9bb9bce4d68b43d71f (patch)
tree957d1b7871a7552a944ec0667f382074f7c05f86 /libstdc++-v3
parentf74c81d55a06e8a92dc252db6983af33d7c78ebc (diff)
downloadgcc-8f4c7b679cee153ac12b9d9bb9bce4d68b43d71f.zip
gcc-8f4c7b679cee153ac12b9d9bb9bce4d68b43d71f.tar.gz
gcc-8f4c7b679cee153ac12b9d9bb9bce4d68b43d71f.tar.bz2
locale.cc (locale::_S_initialize): Re-apply workaround a confusion of the use of the gthr API when...
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
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/src/locale_init.cc7
2 files changed, 8 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 64d19da..be527fa 100644
--- 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 1273b2a..99bfe3e8 100644
--- 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