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
This commit is contained in:
Petur Runolfsson 2003-10-14 04:47:10 +00:00 committed by Andreas Tobler
parent caa55b1e67
commit 9dccaa6bb6
2 changed files with 8 additions and 5 deletions

View File

@ -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>

View File

@ -395,13 +395,10 @@ namespace std
#ifdef __GTHREADS
if (__gthread_active_p())
__gthread_once(&_S_once, _S_initialize_once);
else
#endif
{
if (!_S_classic)
_S_initialize_once();
}
}
void
locale::_M_coalesce(const locale& __base, const locale& __add,