From 238e3a40af2349190dc662aed9476576af4b4516 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 7 Jan 2009 01:56:26 +0000 Subject: [PATCH] locale_init.cc (locale::_S_initialize_once): Move construction of classic locale... 2009-01-06 Benjamin Kosnik * src/locale_init.cc (locale::_S_initialize_once): Move construction of classic locale... (locale::classic): Here. From-SVN: r143149 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/src/locale_init.cc | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ee30286271b..11bf44eef6a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2009-01-06 Benjamin Kosnik + + * src/locale_init.cc (locale::_S_initialize_once): Move construction + of classic locale... + (locale::classic): Here. + 2009-01-06 Jonathan Wakely * include/tr1_impl/regex: Fix bad return statements and typos. diff --git a/libstdc++-v3/src/locale_init.cc b/libstdc++-v3/src/locale_init.cc index 28ee484112f..0730155b236 100644 --- a/libstdc++-v3/src/locale_init.cc +++ b/libstdc++-v3/src/locale_init.cc @@ -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. // // This file is part of the GNU ISO C++ Library. This library is free @@ -242,9 +243,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const locale& locale::classic() - { + { _S_initialize(); - return reinterpret_cast(c_locale); + return *(new (&c_locale) locale(_S_classic)); } void @@ -254,7 +255,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // One reference for _S_classic, one for _S_global _S_classic = new (&c_locale_impl) _Impl(2); _S_global = _S_classic; - new (&c_locale) locale(_S_classic); } void