diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/locale_init.cc | 7 |
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 |