26c691a88b
2004-05-22 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/12854 Fixups for -Weffc++. * include/bits/basic_string.h (basic_string::operator=): Return pointer to this instead of result of assign. Although redundant, this doesn't impact resultant codegen. * include/bits/locale_facets.h (__numpunct_cache): Declare assignment opxserator and copy constructor private. (__timepunct_cache): Same. (__moneypunct_cache): Same. (collate): Use member initialization list for _M_c_locale_collate. * config/locale/gnu/messages_members.h: Same. * config/locale/gnu/time_members.h (__timepunct): Same. * src/codecvt.cc: Use member initialization list to initialize _M_c_locale_codecvt. * src/ctype.cc: Same, with _M_c_locale_ctype and _M_narrow_ok. * config/os/gnu-linux/ctype_noninline.h: Same. * src/locale.cc (_Impl): Same. * src/locale_init.cc: Same. * src/localename.cc: Same. * include/bits/basic_ios.h (basic_ios): Complete member initialization list. * include/bits/istream.tcc (basic_istream::sentry): Same. * include/bits/ostream.tcc (basic_ostream::sentry): Same. * include/bits/fstream.tcc (basic_filebuf): Add _M_lock and _M_pback to member initialization list. * include/std/std_streambuf.h: Same. * include/std/std_sstream.h: Same, for _M_mode. * src/ios.cc (ios_base): Same. * include/ext/rope: Make derived classes match exception specifications. Add copy constructors and assignment operators. * include/debug/safe_base.h (_Safe_sequence_base): Declare copy constructor and assignment operator protected. (_Safe_iterator_base): Same. * include/debug/formatter.h (_Error_formatter): Define copy constructor and assignment operator. * include/backward/strstream: Declare assignment operator and copy constructor private. From-SVN: r82153
105 lines
3.6 KiB
C++
105 lines
3.6 KiB
C++
// std::messages implementation details, GNU version -*- C++ -*-
|
|
|
|
// Copyright (C) 2001, 2002, 2003, 2004 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)
|
|
: facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
|
|
_M_name_messages(_S_get_c_name())
|
|
{ }
|
|
|
|
template<typename _CharT>
|
|
messages<_CharT>::messages(__c_locale __cloc, const char* __s,
|
|
size_t __refs)
|
|
: facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
|
|
_M_name_messages(__s)
|
|
{
|
|
char* __tmp = new char[std::strlen(__s) + 1];
|
|
std::strcpy(__tmp, __s);
|
|
_M_name_messages = __tmp;
|
|
}
|
|
|
|
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 (_M_name_messages != _S_get_c_name())
|
|
delete [] _M_name_messages;
|
|
_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 (this->_M_name_messages != locale::facet::_S_get_c_name())
|
|
delete [] this->_M_name_messages;
|
|
char* __tmp = new char[std::strlen(__s) + 1];
|
|
std::strcpy(__tmp, __s);
|
|
this->_M_name_messages = __tmp;
|
|
|
|
if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
|
|
{
|
|
this->_S_destroy_c_locale(this->_M_c_locale_messages);
|
|
this->_S_create_c_locale(this->_M_c_locale_messages, __s);
|
|
}
|
|
}
|