diff options
Diffstat (limited to 'libstdc++-v3/config/locale/generic')
5 files changed, 101 insertions, 5 deletions
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index 9627d8646af..1f2accb1c29 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -1,6 +1,6 @@ // Wrapper for underlying C-language localization -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 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 @@ -33,6 +33,11 @@ // Written by Benjamin Kosnik <bkoz@redhat.com> +#ifndef _CPP_BITS_C_LOCALE_H +#define _CPP_BITS_C_LOCALE_H 1 + +#pragma GCC system_header + #include <clocale> #define _GLIBCPP_NUM_CATEGORIES 0 @@ -41,9 +46,15 @@ namespace std { typedef int* __c_locale; + // Convert numeric value of type _Tv to string and return length of + // string. If snprintf is available use it, otherwise fall back to + // the unsafe sprintf which, in general, can be dangerous and should + // be avoided. template<typename _Tv> int - __convert_from_v(char* __out, const int __size, const char* __fmt, + __convert_from_v(char* __out, + const int __attribute__ ((__unused__)) __size, + const char* __fmt, _Tv __v, const __c_locale&, int __prec = -1) { char* __old = setlocale(LC_ALL, NULL); @@ -69,3 +80,5 @@ namespace std return __ret; } } + +#endif diff --git a/libstdc++-v3/config/locale/generic/codecvt_members.cc b/libstdc++-v3/config/locale/generic/codecvt_members.cc index 814b8a2874d..ff65dffa1e9 100644 --- a/libstdc++-v3/config/locale/generic/codecvt_members.cc +++ b/libstdc++-v3/config/locale/generic/codecvt_members.cc @@ -34,7 +34,6 @@ // Written by Benjamin Kosnik <bkoz@redhat.com> #include <locale> -#include "c++locale_internal.h" namespace std { diff --git a/libstdc++-v3/config/locale/generic/messages_members.h b/libstdc++-v3/config/locale/generic/messages_members.h index 62dd24d6838..c1c8e4d1ac5 100644 --- a/libstdc++-v3/config/locale/generic/messages_members.h +++ b/libstdc++-v3/config/locale/generic/messages_members.h @@ -1,6 +1,6 @@ // std::messages implementation details, generic version -*- C++ -*- -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 2001, 2003 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 @@ -35,6 +35,16 @@ // Non-virtual member functions. template<typename _CharT> + messages<_CharT>::messages(size_t __refs) + : locale::facet(__refs) + { _M_c_locale_messages = _S_c_locale; } + + template<typename _CharT> + messages<_CharT>::messages(__c_locale, const char*, size_t __refs) + : locale::facet(__refs) + { _M_c_locale_messages = _S_c_locale; } + + template<typename _CharT> typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, const char*) const @@ -42,6 +52,10 @@ // Virtual member functions. template<typename _CharT> + messages<_CharT>::~messages() + { _S_destroy_c_locale(_M_c_locale_messages); } + + template<typename _CharT> typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<char>&, const locale&) const { return 0; } @@ -56,3 +70,12 @@ void messages<_CharT>::do_close(catalog) const { } + + // messages_byname + template<typename _CharT> + messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) + : messages<_CharT>(__refs) + { + _S_destroy_c_locale(_M_c_locale_messages); + _S_create_c_locale(_M_c_locale_messages, __s); + } diff --git a/libstdc++-v3/config/locale/generic/time_members.cc b/libstdc++-v3/config/locale/generic/time_members.cc index 8d5226b0b2e..df43f03a53d 100644 --- a/libstdc++-v3/config/locale/generic/time_members.cc +++ b/libstdc++-v3/config/locale/generic/time_members.cc @@ -1,4 +1,4 @@ -// std::time_get, std::time_put implementation, GNU version -*- C++ -*- +// std::time_get, std::time_put implementation, generic version -*- C++ -*- // Copyright (C) 2001, 2002 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/config/locale/generic/time_members.h b/libstdc++-v3/config/locale/generic/time_members.h new file mode 100644 index 00000000000..03c31d1797e --- /dev/null +++ b/libstdc++-v3/config/locale/generic/time_members.h @@ -0,0 +1,61 @@ +// std::time_get, std::time_put implementation, generic version -*- C++ -*- + +// Copyright (C) 2001, 2002, 2003 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.5.1.2 - time_get functions +// ISO C++ 14882: 22.2.5.3.2 - time_put functions +// + +// Written by Benjamin Kosnik <bkoz@redhat.com> + + template<typename _CharT> + __timepunct<_CharT>::__timepunct(size_t __refs) + : locale::facet(__refs) + { + _M_name_timepunct = _S_c_name; + _M_initialize_timepunct(); + } + + template<typename _CharT> + __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, + size_t __refs) + : locale::facet(__refs) + { + _M_name_timepunct = new char[strlen(__s) + 1]; + strcpy(_M_name_timepunct, __s); + _M_initialize_timepunct(__cloc); + } + + template<typename _CharT> + __timepunct<_CharT>::~__timepunct() + { + if (_S_c_name != _M_name_timepunct) + delete [] _M_name_timepunct; + _S_destroy_c_locale(_M_c_locale_timepunct); + } |