From 78fa66448c770aa99b6f69113061eb5d77581627 Mon Sep 17 00:00:00 2001 From: kan Date: Mon, 10 Feb 2003 05:47:54 +0000 Subject: Gcc 3.2.2-release C++ support bits. --- contrib/libstdc++/config/linker-map.gnu | 68 ++++++++++++++++++++-- .../config/locale/generic/messages_members.h | 25 +++++++- .../config/locale/generic/time_members.cc | 6 +- .../libstdc++/config/locale/generic/time_members.h | 61 +++++++++++++++++++ .../libstdc++/config/locale/gnu/messages_members.h | 52 ++++++++++++++++- contrib/libstdc++/config/locale/gnu/time_members.h | 67 +++++++++++++++++++++ 6 files changed, 268 insertions(+), 11 deletions(-) create mode 100644 contrib/libstdc++/config/locale/generic/time_members.h create mode 100644 contrib/libstdc++/config/locale/gnu/time_members.h (limited to 'contrib/libstdc++/config') diff --git a/contrib/libstdc++/config/linker-map.gnu b/contrib/libstdc++/config/linker-map.gnu index f82002a..4cb122e 100644 --- a/contrib/libstdc++/config/linker-map.gnu +++ b/contrib/libstdc++/config/linker-map.gnu @@ -1,6 +1,6 @@ ## Linker script for GNU ld 2.11.94+ only. ## -## Copyright (C) 2002 Free Software Foundation, Inc. +## Copyright (C) 2002, 2003 Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. ## @@ -50,7 +50,14 @@ GLIBCPP_3.2 { std::[A-Zd-k]*; std::length_error*; std::logic_error*; - std::locale::[A-Za-z]*; + std::locale::[A-Za-e]*; + std::locale::facet::[A-Za-z]*; + std::locale::facet::_M*; + std::locale::facet::_S_c_locale; + std::locale::facet::_S_clone_c_locale*; + std::locale::facet::_S_create_c_locale*; + std::locale::facet::_S_destroy_c_locale*; + std::locale::[A-Zg-z]*; std::locale::_[A-Ra-z]*; std::locale::_S_classic; std::locale::_S_global; @@ -99,6 +106,9 @@ GLIBCPP_3.2 { # std::locale destructors _ZNSt6localeD*; + + # std::locale::facet destructors + _ZNSt6locale5facetD*; # std::codecvt members. _ZNKSt7codecvtIcc11__mbstate_tE*; @@ -204,8 +214,6 @@ GLIBCPP_3.2.1 { _ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_S8_; _ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_ERKS6_S8_; - _ZNSt24__default_alloc_templateILb1ELi0EE12_S_force_newE; - # stub functions from libmath sinf; sinl; @@ -242,11 +250,41 @@ GLIBCPP_3.2.1 { } GLIBCPP_3.2; +GLIBCPP_3.2.2 { + + _ZNSt24__default_alloc_templateILb1ELi0EE12_S_force_newE; + +} GLIBCPP_3.2.1; + + # Symbols in the support library (libsupc++) have their own tag. CXXABI_1.2 { global: - __cxa_*; + __cxa_allocate_exception; + __cxa_bad_cast; + __cxa_bad_typeid; + __cxa_begin_catch; + __cxa_call_unexpected; + __cxa_current_exception_type; + __cxa_demangle; + __cxa_end_catch; + __cxa_free_exception; + __cxa_get_globals; + __cxa_get_globals_fast; + __cxa_pure_virtual; + __cxa_rethrow; + __cxa_throw; + __cxa_vec_cctor; + __cxa_vec_cleanup; + __cxa_vec_ctor; + __cxa_vec_delete2; + __cxa_vec_delete3; + __cxa_vec_delete; + __cxa_vec_dtor; + __cxa_vec_new2; + __cxa_vec_new3; + __cxa_vec_new; __gxx_personality_v0; __gxx_personality_sj0; __dynamic_cast; @@ -254,6 +292,26 @@ CXXABI_1.2 { # __gnu_cxx::_verbose_terminate_handler() _ZN9__gnu_cxx27__verbose_terminate_handlerEv; + # XXX Should not be exported. + __cxa_dyn_string_append_char; + __cxa_dyn_string_append_cstr; + __cxa_dyn_string_append; + __cxa_dyn_string_clear; + __cxa_dyn_string_copy_cstr; + __cxa_dyn_string_copy; + __cxa_dyn_string_delete; + __cxa_dyn_string_eq; + __cxa_dyn_string_init; + __cxa_dyn_string_insert_char; + __cxa_dyn_string_insert_cstr; + __cxa_dyn_string_insert; + __cxa_dyn_string_new; + __cxa_dyn_string_prepend_cstr; + __cxa_dyn_string_prepend; + __cxa_dyn_string_release; + __cxa_dyn_string_resize; + __cxa_dyn_string_substring; + local: *; }; diff --git a/contrib/libstdc++/config/locale/generic/messages_members.h b/contrib/libstdc++/config/locale/generic/messages_members.h index 62dd24d..e8a8656 100644 --- a/contrib/libstdc++/config/locale/generic/messages_members.h +++ b/contrib/libstdc++/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 + messages<_CharT>::messages(size_t __refs) + : locale::facet(__refs) + { _M_c_locale_messages = _S_c_locale; } + + template + messages<_CharT>::messages(__c_locale __cloc, const char*, size_t __refs) + : locale::facet(__refs) + { _M_c_locale_messages = _S_c_locale; } + + template typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string& __s, const locale& __loc, const char*) const @@ -42,6 +52,10 @@ // Virtual member functions. template + messages<_CharT>::~messages() + { _S_destroy_c_locale(_M_c_locale_messages); } + + template typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string&, const locale&) const { return 0; } @@ -56,3 +70,12 @@ void messages<_CharT>::do_close(catalog) const { } + + // messages_byname + template + 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/contrib/libstdc++/config/locale/generic/time_members.cc b/contrib/libstdc++/config/locale/generic/time_members.cc index fd45645..df43f03 100644 --- a/contrib/libstdc++/config/locale/generic/time_members.cc +++ b/contrib/libstdc++/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. // @@ -56,8 +56,8 @@ namespace std __timepunct::_M_initialize_timepunct(__c_locale) { // "C" locale - _M_date_format = "%m/%d/%Y"; - _M_date_era_format = "%m/%d/%Y"; + _M_date_format = "%m/%d/%y"; + _M_date_era_format = "%m/%d/%y"; _M_time_format = "%H:%M:%S"; _M_time_era_format = "%H:%M:%S"; _M_date_time_format = ""; diff --git a/contrib/libstdc++/config/locale/generic/time_members.h b/contrib/libstdc++/config/locale/generic/time_members.h new file mode 100644 index 0000000..03c31d1 --- /dev/null +++ b/contrib/libstdc++/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 + + template + __timepunct<_CharT>::__timepunct(size_t __refs) + : locale::facet(__refs) + { + _M_name_timepunct = _S_c_name; + _M_initialize_timepunct(); + } + + template + __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 + __timepunct<_CharT>::~__timepunct() + { + if (_S_c_name != _M_name_timepunct) + delete [] _M_name_timepunct; + _S_destroy_c_locale(_M_c_locale_timepunct); + } diff --git a/contrib/libstdc++/config/locale/gnu/messages_members.h b/contrib/libstdc++/config/locale/gnu/messages_members.h index 68a2ea3..d98d8d1 100644 --- a/contrib/libstdc++/config/locale/gnu/messages_members.h +++ b/contrib/libstdc++/config/locale/gnu/messages_members.h @@ -1,6 +1,6 @@ // std::messages implementation details, GNU version -*- 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 @@ -28,13 +28,35 @@ // the GNU General Public License. // -// ISO C++ 14882: 22.2.7.1.2 messages virtual functions +// ISO C++ 14882: 22.2.7.1.2 messages functions // // Written by Benjamin Kosnik // Non-virtual member functions. template + messages<_CharT>::messages(size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_messages = _S_c_name; +#endif + _M_c_locale_messages = _S_c_locale; + } + + template + messages<_CharT>::messages(__c_locale __cloc, + const char* __s, size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_messages = new char[strlen(__s) + 1]; + strcpy(_M_name_messages, __s); +#endif + _M_c_locale_messages = _S_clone_c_locale(__cloc); + } + + template typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string& __s, const locale& __loc, const char* __dir) const @@ -43,6 +65,17 @@ return this->do_open(__s, __loc); } + // Virtual member functions. + template + messages<_CharT>::~messages() + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + if (_S_c_name != _M_name_messages) + delete [] _M_name_messages; +#endif + _S_destroy_c_locale(_M_c_locale_messages); + } + template typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string& __s, @@ -58,3 +91,18 @@ void messages<_CharT>::do_close(catalog) const { } + + // messages_byname + template + messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) + : messages<_CharT>(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + if (_S_c_name != _M_name_messages) + delete [] _M_name_messages; + _M_name_messages = new char[strlen(__s) + 1]; + strcpy(_M_name_messages, __s); +#endif + _S_destroy_c_locale(_M_c_locale_messages); + _S_create_c_locale(_M_c_locale_messages, __s); + } diff --git a/contrib/libstdc++/config/locale/gnu/time_members.h b/contrib/libstdc++/config/locale/gnu/time_members.h new file mode 100644 index 0000000..46342e8 --- /dev/null +++ b/contrib/libstdc++/config/locale/gnu/time_members.h @@ -0,0 +1,67 @@ +// std::time_get, std::time_put implementation, GNU 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 + + template + __timepunct<_CharT>::__timepunct(size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_timepunct = _S_c_name; +#endif + _M_initialize_timepunct(); + } + + template + __timepunct<_CharT>::__timepunct(__c_locale __cloc, + const char* __s, size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_timepunct = new char[strlen(__s) + 1]; + strcpy(_M_name_timepunct, __s); +#endif + _M_initialize_timepunct(__cloc); + } + + template + __timepunct<_CharT>::~__timepunct() + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + if (_S_c_name != _M_name_timepunct) + delete [] _M_name_timepunct; +#endif + _S_destroy_c_locale(_M_c_locale_timepunct); + } -- cgit v1.1