procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

locale_init.cc (locale::_S_initialize_once): Move construction of classic locale...

Browse source 
2009-01-06  Benjamin Kosnik  <bkoz@redhat.com>

	* src/locale_init.cc (locale::_S_initialize_once): Move construction
	of classic locale...
	(locale::classic): Here.

From-SVN: r143149
This commit is contained in:
Benjamin Kosnik 2009-01-07 01:56:26 +00:00 • committed by Benjamin Kosnik
parent 246cb5be0e
commit 238e3a40af
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,9 @@
2009-01-06 Benjamin Kosnik <bkoz@redhat.com>
* src/locale_init.cc (locale::_S_initialize_once): Move construction
of classic locale...
(locale::classic): Here.
2009-01-06 Jonathan Wakely <jwakely.gcc@gmail.com> 2009-01-06 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/tr1_impl/regex: Fix bad return statements and typos. * include/tr1_impl/regex: Fix bad return statements and typos.

8
libstdc++-v3/src/locale_init.cc
View file

@ -1,4 +1,5 @@
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
// 2009
// Free Software Foundation, Inc. // Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
@ -242,9 +243,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const locale& const locale&
locale::classic() locale::classic()
{ {
_S_initialize(); _S_initialize();
return reinterpret_cast<const locale&>(c_locale); return *(new (&c_locale) locale(_S_classic));
} }
void void
@ -254,7 +255,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// One reference for _S_classic, one for _S_global // One reference for _S_classic, one for _S_global
_S_classic = new (&c_locale_impl) _Impl(2); _S_classic = new (&c_locale_impl) _Impl(2);
_S_global = _S_classic; _S_global = _S_classic;
new (&c_locale) locale(_S_classic);
} }
void void