mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-21 21:58:44 +08:00
aa53f832ac
2002-10-08 Paolo Carlini <pcarlini@unitus.it>
Benjamin Kosnik <bkoz@redhat.com>
* include/bits/localefwd.h (class locale): Add static member
_S_num_extra_categories, encoding the number of additional
categories.
Change _S_num_categories to _S_categories_size.
(class locale::_Impl): Add _M_c_cats.
(class locale::_Impl::_M_names): Change to array of chars.
(class locale::_Impl::_M_check_same_name): Use
_S_extra_categories_size, tweak.
(locale::locale(const locale&, _Facet*)): Ditto.
* src/locale.cc (locale::locale(const char* )): Rewrite to deal
with the environment in a POSIX-compliant way while being thread
safe.
(locale::name()): Update to output POSIX environment strings.
* src/localename.cc
(locale::_Impl::_Impl(const _Impl&, size_t): Use
_S_categories_size_*, tweak.
(locale::_Impl::_Impl(facet**, size_t, bool)): Ditto.
(locale::_Impl::_Impl(const char*, size_t)): Name each category
individually.
(locale::_Impl::_M_replace_categories): Use strcpy.
* include/bits/locale_facets.h (numpunct::_M_initialize_numpunct):
Change default argument to NULL from _S_c_locale.
(timepunct::_M_initialize_timepunct): Same.
_S_c_locale cleanups.
* src/codecvt.c: _S_c_locale simplification.
* src/ctype.c: Same.
* src/globals.cc: Add fake_name.
* src/locale-inst.cc: Remove extra includes.
* src/locale.cc: Remove extra includes.
Add _S_extra_categories_size definition.
Correct "C" initialization.
(locale::facet::facet): Don't initialize _S_c_locale.
(locale::facet::_M_remove_reference): Adjust.
* src/localename: Use facet_vec, facet_name.
(locale::_Impl::_Impl(facet** __f, size_t __refs, bool)): Set
facet ref counts to one. Initialize _S_c_locale.
(locale::_Impl::_M_install_facet(id*, facet*)): Adjust facet ref
counts when installing unilaterally.
* config/locale/generic/c_locale.cc: Add _S_categories definition.
* config/locale/generic/c_locale.h: Add _GLIBCPP_NUM_CATEGORIES macro.
* config/locale/generic/time_members.cc: _S_c_locale cleanup.
* config/locale/gnu/c_locale.cc: Add _S_categories definition.
(_S_destroy_c_locale): Move checks against _S_c_locale here.
* config/locale/gnu/c_locale.h: Add _GLIBCPP_NUM_CATEGORIES macro.
* config/locale/gnu/ctype_members.cc: Simplify _S_destroy_c_locale
calls, _S_c_locale usage.
* config/locale/gnu/monetary_members.cc: Same, tweaks.
* config/locale/gnu/monetary_members.cc: Same.
* config/locale/gnu/time_members.cc: Same.
* config/os/gnu-linux/ctype_noninline.h: Use locale::classic().
* docs/html/22_locale/locale.html: Add bits about global locales
and "C" setlocale.
* testsuite/22_locale/facet.cc (test02): Add.
* testsuite/22_locale/static_members.cc (test02): Add.
* testsuite/22_locale/ctor_copy_dtor.cc (test04): Add.
Co-Authored-By: Benjamin Kosnik <bkoz@redhat.com>
From-SVN: r57964
95 lines
3.0 KiB
C++
95 lines
3.0 KiB
C++
// Wrapper for underlying C-language localization -*- C++ -*-
|
|
|
|
// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 2, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License along
|
|
// with this library; see the file COPYING. If not, write to the Free
|
|
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
// USA.
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
//
|
|
// ISO C++ 14882: 22.8 Standard locale categories.
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
#include <clocale>
|
|
#include <langinfo.h> // For codecvt
|
|
#include <iconv.h> // For codecvt using iconv, iconv_t
|
|
#include <libintl.h> // For messages
|
|
|
|
#define _GLIBCPP_C_LOCALE_GNU 1
|
|
|
|
#define _GLIBCPP_NUM_CATEGORIES 6
|
|
|
|
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
|
namespace __gnu_cxx
|
|
{
|
|
extern "C" __typeof(uselocale) __uselocale;
|
|
}
|
|
#endif
|
|
|
|
namespace std
|
|
{
|
|
typedef __locale_t __c_locale;
|
|
|
|
template<typename _Tv>
|
|
int
|
|
__convert_from_v(char* __out, const int __size, const char* __fmt,
|
|
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
|
_Tv __v, const __c_locale& __cloc, int __prec = -1)
|
|
{
|
|
__c_locale __old = __gnu_cxx::__uselocale(__cloc);
|
|
#else
|
|
_Tv __v, const __c_locale&, int __prec = -1)
|
|
{
|
|
char* __old = setlocale(LC_ALL, NULL);
|
|
char* __sav = static_cast<char*>(malloc(strlen(__old) + 1));
|
|
if (__sav)
|
|
strcpy(__sav, __old);
|
|
setlocale(LC_ALL, "C");
|
|
#endif
|
|
|
|
int __ret;
|
|
#ifdef _GLIBCPP_USE_C99
|
|
if (__prec >= 0)
|
|
__ret = snprintf(__out, __size, __fmt, __prec, __v);
|
|
else
|
|
__ret = snprintf(__out, __size, __fmt, __v);
|
|
#else
|
|
if (__prec >= 0)
|
|
__ret = sprintf(__out, __fmt, __prec, __v);
|
|
else
|
|
__ret = sprintf(__out, __fmt, __v);
|
|
#endif
|
|
|
|
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
|
__gnu_cxx::__uselocale(__old);
|
|
#else
|
|
setlocale(LC_ALL, __sav);
|
|
free(__sav);
|
|
#endif
|
|
return __ret;
|
|
}
|
|
}
|