mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-23 21:59:52 +08:00
43be7fe7d7
(ctype<wchar_t>::_M_convert_to_wmask): Remove stray semicolon. * config/locale/gnu/monetary_members.cc (moneypunct<wchar_t, true>::_M_initialize_moneypunct): Avoid defining classes in static_cast. (moneypunct<wchar_t, false>::_M_initialize_moneypunct): Likewise. * config/locale/gnu/numeric_members.cc (numpunct<wchar_t, false>::_M_initialize_numpunct): Likewise. * include/bits/stl_deque.h (operator-): Insert typename where required. * include/bits/stl_multiset.h (multiset): Remove stray semicolon. * include/bits/stl_set.h (set): Likewise. * include/bits/valarray_meta.h (bits/slice_array.h): Include it. * include/std/std_fstream.h (basic_fstream::open): Use this-> to avoid Koenig lookup. (basic_fstream::close): Likewise. * libsupc++/new (operator delete): Remove stray semicolon. * libsupc++/new (operator delete[]): Likewise. * libsupc++/tinfo.cc: Likewise. * src/stdexcept.c (logic_error::~logic_error): Likewise. (runtime_error::~runtime_error): Likewise. From-SVN: r60547
112 lines
3.4 KiB
C++
112 lines
3.4 KiB
C++
// std::numpunct implementation details, GNU version -*- 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.2.3.1.2 numpunct virtual functions
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
#include <locale>
|
|
#include <bits/c++locale_internal.h>
|
|
|
|
namespace std
|
|
{
|
|
template<>
|
|
void
|
|
numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
|
|
{
|
|
if (!__cloc)
|
|
{
|
|
// "C" locale
|
|
_M_decimal_point = '.';
|
|
_M_thousands_sep = ',';
|
|
_M_grouping = "";
|
|
}
|
|
else
|
|
{
|
|
// Named locale.
|
|
_M_decimal_point = *(__nl_langinfo_l(RADIXCHAR, __cloc));
|
|
_M_thousands_sep = *(__nl_langinfo_l(THOUSEP, __cloc));
|
|
// Check for NUL, which implies no grouping.
|
|
if (_M_thousands_sep == '\0')
|
|
_M_grouping = "";
|
|
else
|
|
_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
|
|
}
|
|
// NB: There is no way to extact this info from posix locales.
|
|
// _M_truename = __nl_langinfo_l(YESSTR, __cloc);
|
|
_M_truename = "true";
|
|
// _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
|
|
_M_falsename = "false";
|
|
}
|
|
|
|
template<>
|
|
numpunct<char>::~numpunct()
|
|
{ }
|
|
|
|
#ifdef _GLIBCPP_USE_WCHAR_T
|
|
template<>
|
|
void
|
|
numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
|
|
{
|
|
if (!__cloc)
|
|
{
|
|
// "C" locale
|
|
_M_decimal_point = L'.';
|
|
_M_thousands_sep = L',';
|
|
_M_grouping = "";
|
|
}
|
|
else
|
|
{
|
|
// Named locale.
|
|
union __s_and_w { const char *__s; unsigned int __w; } __u;
|
|
__u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
|
|
_M_decimal_point = static_cast<wchar_t>(__u.__w);
|
|
|
|
__u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
|
|
_M_thousands_sep = static_cast<wchar_t>(__u.__w);
|
|
if (_M_thousands_sep == L'\0')
|
|
_M_grouping = "";
|
|
else
|
|
_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
|
|
}
|
|
// NB: There is no way to extact this info from posix locales.
|
|
// _M_truename = __nl_langinfo_l(YESSTR, __cloc);
|
|
_M_truename = L"true";
|
|
// _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
|
|
_M_falsename = L"false";
|
|
}
|
|
|
|
template<>
|
|
numpunct<wchar_t>::~numpunct()
|
|
{ }
|
|
#endif
|
|
}
|