12ffa22844
2011-01-30 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/36104 part four * include/bits/c++config (_GLIBCXX_STD): Remove. (_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C. (_GLIBCXX_P): Now _GLIBCXX_STD_A. (_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL, _GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove. (_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL, _GLIBCXX_INLINE_PROFILE): Remove. (_GLIBCXX_BEGIN_NAMESPACE(X)): Remove. (_GLIBCXX_END_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove. (_GLIBCXX_END_NESTED_NAMESPACE): Remove. (_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add. (_GLIBCXX_END_NAMESPACE_ALGO): Add. (_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add. (_GLIBCXX_END_NAMESPACE_CONTAINER): Add. (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add. (_GLIBCXX_END_NAMESPACE_VERSION): Add. (_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL. (_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL. (_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY. * include/*: Use new macros for namespace scope. * config/*: Same. * src/*: Same. * src/Makefile.am (sources): Remove debug_list.cc, add compatibility-debug_list-2.cc. (parallel_sources): Remove parallel_list.cc, add compatibility-parallel_list-2.cc. (compatibility-parallel_list-2.[o,lo]): New rule. * src/Makefile.in: Regenerate. * src/debug_list.cc: Remove. * src/parallel_list.cc: Remove. * src/compatibility-list-2.cc: New. * src/compatibility-debug_list-2.cc: New. * src/compatibility-parallel_list-2.cc: New. * doc/doxygen/user.cfg.in: Adjust macros. * testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros. * testsuite/20_util/declval/requirements/1_neg.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same. * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same. * testsuite/20_util/forward/c_neg.cc: Same. * testsuite/20_util/forward/f_neg.cc: Same. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same. * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same. * testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same. * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/forward_list/capacity/1.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ assign_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/forward_list/requirements/dr438/ insert_neg.cc: Same. * testsuite/23_containers/list/capacity/29134.cc: Same. * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/vector/bool/capacity/29134.cc: Same. * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same. * testsuite/25_algorithms/sort/35588.cc: Same. * testsuite/27_io/ios_base/cons/assign_neg.cc: Same. * testsuite/27_io/ios_base/cons/copy_neg.cc: Same. * testsuite/ext/profile/mutex_extensions_neg.cc: Same. * testsuite/ext/profile/profiler_algos.cc: Same. * testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same. * testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same. * testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same. From-SVN: r169421
132 lines
4.0 KiB
C++
132 lines
4.0 KiB
C++
// std::messages implementation details, GNU version -*- C++ -*-
|
|
|
|
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
|
|
// 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 3, 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.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file bits/messages_members.h
|
|
* This is an internal header file, included by other library headers.
|
|
* Do not attempt to use it directly. @headername{locale}
|
|
*/
|
|
|
|
//
|
|
// ISO C++ 14882: 22.2.7.1.2 messages functions
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
#include <libintl.h>
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
// 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(0), _M_name_messages(0)
|
|
{
|
|
if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
|
|
{
|
|
const size_t __len = __builtin_strlen(__s) + 1;
|
|
char* __tmp = new char[__len];
|
|
__builtin_memcpy(__tmp, __s, __len);
|
|
_M_name_messages = __tmp;
|
|
}
|
|
else
|
|
_M_name_messages = _S_get_c_name();
|
|
|
|
// Last to avoid leaking memory if new throws.
|
|
_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 (_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;
|
|
if (__builtin_strcmp(__s, locale::facet::_S_get_c_name()) != 0)
|
|
{
|
|
const size_t __len = __builtin_strlen(__s) + 1;
|
|
char* __tmp = new char[__len];
|
|
__builtin_memcpy(__tmp, __s, __len);
|
|
this->_M_name_messages = __tmp;
|
|
}
|
|
else
|
|
this->_M_name_messages = locale::facet::_S_get_c_name();
|
|
}
|
|
|
|
if (__builtin_strcmp(__s, "C") != 0
|
|
&& __builtin_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);
|
|
}
|
|
}
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace
|