diff options
author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-14 04:47:10 +0000 |
---|---|---|
committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-14 04:47:10 +0000 |
commit | e33a167f2fd68f43fa3953bd672bb1b4ec9cfec9 (patch) | |
tree | 1942808c12dcf58030c8e17ac8ed87021f5873c4 /libstdc++-v3 | |
parent | d58156a1af6c3aa1f9408c675ab20e7e26b9541b (diff) | |
download | gcc-e33a167f2fd68f43fa3953bd672bb1b4ec9cfec9.tar.gz |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72458 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
-rw-r--r-- | libstdc++-v3/src/locale.cc | 7 |
2 files changed, 8 insertions, 5 deletions
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 |