mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-27 03:49:03 +08:00
8fbc5ae723
* cp-tree.h (lang_type_class): Remove is_partial_instantiation. (PARTIAL_INSTANTIATION_P): Remove. (IMPLICIT_TYPENAME_P): Likewise. (IMPLICIT_TYPENAME_TYPE_DECL_P): Likewise. (build_typename_type): Remove declaration. (parmlist_is_exprlist): Likewise. * decl.c (build_typename_type): Make it static, remove third parameter. (push_class_binding): Don't do implicit typename stuff. (make_typename_type): Likewise. (lookup_name_real): Likewise. (grokdeclarator): Don't try to convert declarations into initializations. Don't do implicit typename stuff. (parmlist_is_exprlist): Remove. (xref_basetypes): Simplify. * decl2.c (grokfield): Don't try to convert declarations into initializations. (build_anon_union_vars): Do this while processing templates, too. (finish_anon_union): Likewise. * error.c (dump_type): Remove implicit typename handling. * parser.c (cp_parser_diagnose_invalid_type_name): New method. (cp_parser_primary_expression): Correct handling of names not found by unqualified name lookup in templates. (cp_parser_nested_name_specifier_opt): Avoid checking dependency of types when possible. (cp_parser_simple_declaration): Complain intelligently about some invalid declarations. (cp_parser_member_declaration): Likewise. (cp_parser_constructor_declarator_p): Don't check when we're in a function scope. * pt.c (instantiate_class_template): Remove PARTIAL_INSTANTIATION_P gunk. * search.c (lookup_field_r): Don't build implicit typenames. (marked_pushdecls_p): Don't enter dependent base types. (unmarked_pushdecls_p): Likewise. * semantics.c (begin_class_definition): Remove implicit typename stuff. * config/locale/gnu/messages_members.h: Use this-> to refer to unqualified members of base clasess. * config/locale/ieee_1003.1-2001/codecvt_specializations.h: Likewise. * include/bits/codecvt.h: Likewise. * include/bits/deque.tcc: Likewise. * include/bits/fstream.tcc: Likewise. * include/bits/istream.tcc: Likewise. * include/bits/list.tcc: Likewise. * include/bits/locale_facets.h: Likewise. * include/bits/ostream.tcc: Likewise. * include/bits/sstream.tcc: Likewise. * include/bits/stl_bvector.h: Likewise. * include/bits/stl_deque.h: Likewise. * include/bits/stl_list.h: Likewise. * include/bits/stl_tree.h: Likewise. * include/bits/stl_vector.h: Likewise. * include/bits/vector.tcc: Likewise. * include/ext/ropeimpl.h: Likewise. * include/ext/stdio_filebuf.h: Likewise. * include/ext/stl_rope.h: Likewise. * include/std/std_fstream.h: Likewise. * include/std/std_sstream.h: Likewise. Co-Authored-By: Jeffrey Oldham <oldham@codesourcery.com> From-SVN: r61403
110 lines
3.7 KiB
C++
110 lines
3.7 KiB
C++
// std::messages implementation details, 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.7.1.2 messages functions
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
// Non-virtual member functions.
|
|
template<typename _CharT>
|
|
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<typename _CharT>
|
|
messages<_CharT>::messages(__c_locale __cloc,
|
|
const char* __s __attribute__ ((__unused__)),
|
|
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 _CharT>
|
|
typename messages<_CharT>::catalog
|
|
messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
|
|
const char* __dir) const
|
|
{
|
|
bindtextdomain(__s.c_str(), __dir);
|
|
return this->do_open(__s, __loc);
|
|
}
|
|
|
|
// Virtual member functions.
|
|
template<typename _CharT>
|
|
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 _CharT>
|
|
typename messages<_CharT>::catalog
|
|
messages<_CharT>::do_open(const basic_string<char>& __s,
|
|
const locale&) const
|
|
{
|
|
// No error checking is done, assume the catalog exists and can
|
|
// be used.
|
|
textdomain(__s.c_str());
|
|
return 0;
|
|
}
|
|
|
|
template<typename _CharT>
|
|
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)
|
|
{
|
|
#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2))
|
|
if (this->_S_c_name != this->_M_name_messages)
|
|
delete [] this->_M_name_messages;
|
|
this->_M_name_messages = new char[strlen(__s) + 1];
|
|
strcpy(this->_M_name_messages, __s);
|
|
#endif
|
|
_S_destroy_c_locale(this->_M_c_locale_messages);
|
|
_S_create_c_locale(this->_M_c_locale_messages, __s);
|
|
}
|