2001-08-08 04:49:01 +02:00
|
|
|
// Locale support (codecvt) -*- C++ -*-
|
|
|
|
|
2015-01-05 13:33:28 +01:00
|
|
|
// Copyright (C) 2000-2015 Free Software Foundation, Inc.
|
2001-08-08 04:49:01 +02:00
|
|
|
//
|
|
|
|
// 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
|
2009-04-09 17:00:19 +02:00
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
2001-08-08 04:49:01 +02:00
|
|
|
// 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.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// 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/>.
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
//
|
|
|
|
// ISO C++ 14882: 22.2.1.5 Template class codecvt
|
|
|
|
//
|
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2006-07-11 19:48:10 +02:00
|
|
|
/** @file ext/codecvt_specializations.h
|
2005-01-07 20:34:46 +01:00
|
|
|
* This file is a GNU extension to the Standard C++ Library.
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
*/
|
|
|
|
|
2006-07-11 19:48:10 +02:00
|
|
|
#ifndef _EXT_CODECVT_SPECIALIZATIONS_H
|
|
|
|
#define _EXT_CODECVT_SPECIALIZATIONS_H 1
|
|
|
|
|
2006-07-12 02:17:42 +02:00
|
|
|
#include <bits/c++config.h>
|
2006-07-11 19:48:10 +02:00
|
|
|
#include <locale>
|
|
|
|
#include <iconv.h>
|
|
|
|
|
PR libstdc++/36104 part four
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
2011-01-30 23:39:36 +01:00
|
|
|
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2005-12-19 01:56:05 +01:00
|
|
|
|
2008-03-26 07:27:35 +01:00
|
|
|
/// Extension to use iconv for dealing with character encodings.
|
2004-11-05 20:58:03 +01:00
|
|
|
// This includes conversions and comparisons between various character
|
2002-02-01 04:20:39 +01:00
|
|
|
// sets. This object encapsulates data that may need to be shared between
|
|
|
|
// char_traits, codecvt and ctype.
|
re PR c++/65046 (-Wabi-tag doesn't warn about variables or function return types)
PR c++/65046
* config/locale/gnu/messages_members.cc (Catalog_info, Catalogs,
get_catalogs): Add abi-tag.
* include/ext/codecvt_specializations.h (encoding_state,
encoding_char_traits): Likewise.
* src/c++11/cxx11-ios_failure.cc (io_error_category): Likewise.
* src/c++11/cxx11-shim_facets.cc (__any_string::operator basic_string,
numpunct_shim, collate_shim, time_get_shim, moneypunct_shim,
money_get_shim, money_put_shim, messages_shim): Likewise.
* src/c++11/future.cc (future_error_category::message): Likewise.
* src/c++11/system_error.cc (generic_error_category::message,
system_error_category::message): Likewise.
(__sso_string): Disable -Wabi-tag warnings.
From-SVN: r221497
2015-03-18 19:08:29 +01:00
|
|
|
class _GLIBCXX_DEFAULT_ABI_TAG encoding_state
|
2001-08-08 04:49:01 +02:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Types:
|
|
|
|
// NB: A conversion descriptor subsumes and enhances the
|
|
|
|
// functionality of a simple state type such as mbstate_t.
|
2005-01-07 20:34:46 +01:00
|
|
|
typedef iconv_t descriptor_type;
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
protected:
|
|
|
|
// Name of internal character set encoding.
|
2005-01-07 20:34:46 +01:00
|
|
|
std::string _M_int_enc;
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
// Name of external character set encoding.
|
2005-01-07 20:34:46 +01:00
|
|
|
std::string _M_ext_enc;
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
// Conversion descriptor between external encoding to internal encoding.
|
2005-01-07 20:34:46 +01:00
|
|
|
descriptor_type _M_in_desc;
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
// Conversion descriptor between internal encoding to external encoding.
|
2005-01-07 20:34:46 +01:00
|
|
|
descriptor_type _M_out_desc;
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
// The byte-order marker for the external encoding, if necessary.
|
2001-08-08 04:49:01 +02:00
|
|
|
int _M_ext_bom;
|
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
// The byte-order marker for the internal encoding, if necessary.
|
2001-08-08 04:49:01 +02:00
|
|
|
int _M_int_bom;
|
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
// Number of external bytes needed to construct one complete
|
|
|
|
// character in the internal encoding.
|
|
|
|
// NB: -1 indicates variable, or stateful, encodings.
|
|
|
|
int _M_bytes;
|
2002-02-01 04:20:39 +01:00
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
public:
|
|
|
|
explicit
|
|
|
|
encoding_state()
|
|
|
|
: _M_in_desc(0), _M_out_desc(0), _M_ext_bom(0), _M_int_bom(0), _M_bytes(0)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
explicit
|
|
|
|
encoding_state(const char* __int, const char* __ext,
|
|
|
|
int __ibom = 0, int __ebom = 0, int __bytes = 1)
|
|
|
|
: _M_int_enc(__int), _M_ext_enc(__ext), _M_in_desc(0), _M_out_desc(0),
|
|
|
|
_M_ext_bom(__ebom), _M_int_bom(__ibom), _M_bytes(__bytes)
|
|
|
|
{ init(); }
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
// 21.1.2 traits typedefs
|
|
|
|
// p4
|
|
|
|
// typedef STATE_T state_type
|
|
|
|
// requires: state_type shall meet the requirements of
|
|
|
|
// CopyConstructible types (20.1.3)
|
2008-01-31 19:44:55 +01:00
|
|
|
// NB: This does not preserve the actual state of the conversion
|
2004-03-27 17:21:21 +01:00
|
|
|
// descriptor member, but it does duplicate the encoding
|
|
|
|
// information.
|
2005-01-07 20:34:46 +01:00
|
|
|
encoding_state(const encoding_state& __obj) : _M_in_desc(0), _M_out_desc(0)
|
|
|
|
{ construct(__obj); }
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2002-02-01 04:20:39 +01:00
|
|
|
// Need assignment operator as well.
|
2005-01-07 20:34:46 +01:00
|
|
|
encoding_state&
|
|
|
|
operator=(const encoding_state& __obj)
|
2002-02-01 04:20:39 +01:00
|
|
|
{
|
2005-01-07 20:34:46 +01:00
|
|
|
construct(__obj);
|
2002-05-26 16:35:04 +02:00
|
|
|
return *this;
|
2002-02-01 04:20:39 +01:00
|
|
|
}
|
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
~encoding_state()
|
|
|
|
{ destroy(); }
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
bool
|
|
|
|
good() const throw()
|
|
|
|
{
|
2007-10-11 12:50:09 +02:00
|
|
|
const descriptor_type __err = (iconv_t)(-1);
|
2005-01-07 20:34:46 +01:00
|
|
|
bool __test = _M_in_desc && _M_in_desc != __err;
|
|
|
|
__test &= _M_out_desc && _M_out_desc != __err;
|
|
|
|
return __test;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
character_ratio() const
|
|
|
|
{ return _M_bytes; }
|
|
|
|
|
|
|
|
const std::string
|
|
|
|
internal_encoding() const
|
|
|
|
{ return _M_int_enc; }
|
|
|
|
|
|
|
|
int
|
|
|
|
internal_bom() const
|
|
|
|
{ return _M_int_bom; }
|
|
|
|
|
|
|
|
const std::string
|
|
|
|
external_encoding() const
|
|
|
|
{ return _M_ext_enc; }
|
|
|
|
|
|
|
|
int
|
|
|
|
external_bom() const
|
|
|
|
{ return _M_ext_bom; }
|
|
|
|
|
|
|
|
const descriptor_type&
|
|
|
|
in_descriptor() const
|
|
|
|
{ return _M_in_desc; }
|
|
|
|
|
|
|
|
const descriptor_type&
|
|
|
|
out_descriptor() const
|
|
|
|
{ return _M_out_desc; }
|
|
|
|
|
|
|
|
protected:
|
2001-08-08 04:49:01 +02:00
|
|
|
void
|
2005-01-07 20:34:46 +01:00
|
|
|
init()
|
2001-08-08 04:49:01 +02:00
|
|
|
{
|
2007-10-11 12:50:09 +02:00
|
|
|
const descriptor_type __err = (iconv_t)(-1);
|
2005-01-07 20:34:46 +01:00
|
|
|
const bool __have_encodings = _M_int_enc.size() && _M_ext_enc.size();
|
|
|
|
if (!_M_in_desc && __have_encodings)
|
2002-02-01 04:20:39 +01:00
|
|
|
{
|
2005-01-07 20:34:46 +01:00
|
|
|
_M_in_desc = iconv_open(_M_int_enc.c_str(), _M_ext_enc.c_str());
|
2002-02-01 04:20:39 +01:00
|
|
|
if (_M_in_desc == __err)
|
2005-01-07 20:34:46 +01:00
|
|
|
std::__throw_runtime_error(__N("encoding_state::_M_init "
|
|
|
|
"creating iconv input descriptor failed"));
|
2002-02-01 04:20:39 +01:00
|
|
|
}
|
2005-01-07 20:34:46 +01:00
|
|
|
if (!_M_out_desc && __have_encodings)
|
2002-02-01 04:20:39 +01:00
|
|
|
{
|
2005-01-07 20:34:46 +01:00
|
|
|
_M_out_desc = iconv_open(_M_ext_enc.c_str(), _M_int_enc.c_str());
|
2002-02-01 04:20:39 +01:00
|
|
|
if (_M_out_desc == __err)
|
2005-01-07 20:34:46 +01:00
|
|
|
std::__throw_runtime_error(__N("encoding_state::_M_init "
|
2004-01-27 01:49:03 +01:00
|
|
|
"creating iconv output descriptor failed"));
|
2002-02-01 04:20:39 +01:00
|
|
|
}
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
|
2004-03-27 17:21:21 +01:00
|
|
|
void
|
2005-01-07 20:34:46 +01:00
|
|
|
construct(const encoding_state& __obj)
|
2004-03-27 17:21:21 +01:00
|
|
|
{
|
2005-01-07 20:34:46 +01:00
|
|
|
destroy();
|
|
|
|
_M_int_enc = __obj._M_int_enc;
|
|
|
|
_M_ext_enc = __obj._M_ext_enc;
|
|
|
|
_M_ext_bom = __obj._M_ext_bom;
|
|
|
|
_M_int_bom = __obj._M_int_bom;
|
|
|
|
_M_bytes = __obj._M_bytes;
|
|
|
|
init();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
destroy() throw()
|
|
|
|
{
|
2007-10-11 12:50:09 +02:00
|
|
|
const descriptor_type __err = (iconv_t)(-1);
|
2004-03-27 17:21:21 +01:00
|
|
|
if (_M_in_desc && _M_in_desc != __err)
|
|
|
|
{
|
|
|
|
iconv_close(_M_in_desc);
|
|
|
|
_M_in_desc = 0;
|
|
|
|
}
|
|
|
|
if (_M_out_desc && _M_out_desc != __err)
|
|
|
|
{
|
|
|
|
iconv_close(_M_out_desc);
|
|
|
|
_M_out_desc = 0;
|
|
|
|
}
|
|
|
|
}
|
2005-01-07 20:34:46 +01:00
|
|
|
};
|
2004-03-27 17:21:21 +01:00
|
|
|
|
2008-03-26 07:27:35 +01:00
|
|
|
/// encoding_char_traits
|
2005-01-07 20:34:46 +01:00
|
|
|
// Custom traits type with encoding_state for the state type, and the
|
|
|
|
// associated fpos<encoding_state> for the position type, all other
|
|
|
|
// bits equivalent to the required char_traits instantiations.
|
|
|
|
template<typename _CharT>
|
re PR c++/65046 (-Wabi-tag doesn't warn about variables or function return types)
PR c++/65046
* config/locale/gnu/messages_members.cc (Catalog_info, Catalogs,
get_catalogs): Add abi-tag.
* include/ext/codecvt_specializations.h (encoding_state,
encoding_char_traits): Likewise.
* src/c++11/cxx11-ios_failure.cc (io_error_category): Likewise.
* src/c++11/cxx11-shim_facets.cc (__any_string::operator basic_string,
numpunct_shim, collate_shim, time_get_shim, moneypunct_shim,
money_get_shim, money_put_shim, messages_shim): Likewise.
* src/c++11/future.cc (future_error_category::message): Likewise.
* src/c++11/system_error.cc (generic_error_category::message,
system_error_category::message): Likewise.
(__sso_string): Disable -Wabi-tag warnings.
From-SVN: r221497
2015-03-18 19:08:29 +01:00
|
|
|
struct _GLIBCXX_DEFAULT_ABI_TAG encoding_char_traits
|
|
|
|
: public std::char_traits<_CharT>
|
2005-01-07 20:34:46 +01:00
|
|
|
{
|
|
|
|
typedef encoding_state state_type;
|
|
|
|
typedef typename std::fpos<state_type> pos_type;
|
|
|
|
};
|
2002-02-01 04:20:39 +01:00
|
|
|
|
PR libstdc++/36104 part four
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
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2005-12-19 01:56:05 +01:00
|
|
|
|
|
|
|
|
PR libstdc++/36104 part four
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
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2005-12-19 01:56:05 +01:00
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
using __gnu_cxx::encoding_state;
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2008-03-26 07:27:35 +01:00
|
|
|
/// codecvt<InternT, _ExternT, encoding_state> specialization.
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
// This partial specialization takes advantage of iconv to provide
|
|
|
|
// code conversions between a large number of character encodings.
|
2001-08-08 04:49:01 +02:00
|
|
|
template<typename _InternT, typename _ExternT>
|
2005-01-07 20:34:46 +01:00
|
|
|
class codecvt<_InternT, _ExternT, encoding_state>
|
|
|
|
: public __codecvt_abstract_base<_InternT, _ExternT, encoding_state>
|
2001-08-08 04:49:01 +02:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Types:
|
|
|
|
typedef codecvt_base::result result;
|
|
|
|
typedef _InternT intern_type;
|
|
|
|
typedef _ExternT extern_type;
|
2005-01-07 20:34:46 +01:00
|
|
|
typedef __gnu_cxx::encoding_state state_type;
|
|
|
|
typedef state_type::descriptor_type descriptor_type;
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
// Data Members:
|
|
|
|
static locale::id id;
|
|
|
|
|
|
|
|
explicit
|
|
|
|
codecvt(size_t __refs = 0)
|
|
|
|
: __codecvt_abstract_base<intern_type, extern_type, state_type>(__refs)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
explicit
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt(state_type& __enc, size_t __refs = 0)
|
2001-08-08 04:49:01 +02:00
|
|
|
: __codecvt_abstract_base<intern_type, extern_type, state_type>(__refs)
|
|
|
|
{ }
|
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
protected:
|
2001-08-08 04:49:01 +02:00
|
|
|
virtual
|
|
|
|
~codecvt() { }
|
|
|
|
|
|
|
|
virtual result
|
|
|
|
do_out(state_type& __state, const intern_type* __from,
|
|
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
|
|
extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual result
|
|
|
|
do_unshift(state_type& __state, extern_type* __to,
|
|
|
|
extern_type* __to_end, extern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual result
|
|
|
|
do_in(state_type& __state, const extern_type* __from,
|
|
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
|
|
intern_type* __to, intern_type* __to_end,
|
|
|
|
intern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual int
|
|
|
|
do_encoding() const throw();
|
|
|
|
|
|
|
|
virtual bool
|
|
|
|
do_always_noconv() const throw();
|
|
|
|
|
|
|
|
virtual int
|
[multiple changes]
2003-02-06 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc (test01):
Explicitly use the "C" locale.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc (test01): Same.
2003-02-06 Petur Runolfsson <peturr02@ru.is>
DR 75
DR 305
PR libstdc++/9028 (partial)
PR libstdc++/9224
PR libstdc++/9246
PR libstdc++/9247
* src/codecvt.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length):
Move...
* config/locale/generic/codecvt_members.cc: ...here.
* config/locale/gnu/codecvt_members.cc: ...and here.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding
codecvt<wchar_t, char, mbstate_t>::do_in,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length,
codecvt<wchar_t, char, mbstate_t>::do_out):
New implementation that handles stateless encodings,
including UTF-8.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc,
* config/locale/ieee_1003.1-2001/codecvt_specializations.h,
* include/bits/codecvt.h,
* src/codecvt.cc
(codecvt::length, codecvt::do_length):
Change type of first argument of length and do_length from
'const state_type&' to 'state_type&' according to DR 75.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc:
Cleanup and check for correct return value from encoding
for "C" locale.
* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/in/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/8.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/9.cc: New test.
* testsuite/22_locale/codecvt/length/char/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/char/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/out/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/unicode/1.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/unshfit/wchar_t/4.cc: New test.
From-SVN: r62474
2003-02-06 07:24:21 +01:00
|
|
|
do_length(state_type&, const extern_type* __from,
|
2001-08-08 04:49:01 +02:00
|
|
|
const extern_type* __end, size_t __max) const;
|
|
|
|
|
|
|
|
virtual int
|
|
|
|
do_max_length() const throw();
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
locale::id
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::id;
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
// This adaptor works around the signature problems of the second
|
|
|
|
// argument to iconv(): SUSv2 and others use 'const char**', but glibc 2.2
|
2002-02-08 02:34:41 +01:00
|
|
|
// uses 'char**', which matches the POSIX 1003.1-2001 standard.
|
|
|
|
// Using this adaptor, g++ will do the work for us.
|
2006-07-30 18:42:39 +02:00
|
|
|
template<typename _Tp>
|
2001-08-08 04:49:01 +02:00
|
|
|
inline size_t
|
2006-07-30 18:42:39 +02:00
|
|
|
__iconv_adaptor(size_t(*__func)(iconv_t, _Tp, size_t*, char**, size_t*),
|
2002-02-08 02:34:41 +01:00
|
|
|
iconv_t __cd, char** __inbuf, size_t* __inbytes,
|
|
|
|
char** __outbuf, size_t* __outbytes)
|
2006-07-30 18:42:39 +02:00
|
|
|
{ return __func(__cd, (_Tp)__inbuf, __inbytes, __outbuf, __outbytes); }
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
codecvt_base::result
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
2001-08-08 04:49:01 +02:00
|
|
|
do_out(state_type& __state, const intern_type* __from,
|
|
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
|
|
extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const
|
|
|
|
{
|
2003-01-16 21:30:50 +01:00
|
|
|
result __ret = codecvt_base::error;
|
2005-01-07 20:34:46 +01:00
|
|
|
if (__state.good())
|
2001-08-08 04:49:01 +02:00
|
|
|
{
|
2005-01-07 20:34:46 +01:00
|
|
|
const descriptor_type& __desc = __state.out_descriptor();
|
2002-04-01 10:55:05 +02:00
|
|
|
const size_t __fmultiple = sizeof(intern_type);
|
2002-02-08 02:34:41 +01:00
|
|
|
size_t __fbytes = __fmultiple * (__from_end - __from);
|
2002-04-01 10:55:05 +02:00
|
|
|
const size_t __tmultiple = sizeof(extern_type);
|
2002-02-08 02:34:41 +01:00
|
|
|
size_t __tbytes = __tmultiple * (__to_end - __to);
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
// Argument list for iconv specifies a byte sequence. Thus,
|
|
|
|
// all to/from arrays must be brutally casted to char*.
|
|
|
|
char* __cto = reinterpret_cast<char*>(__to);
|
|
|
|
char* __cfrom;
|
|
|
|
size_t __conv;
|
|
|
|
|
|
|
|
// Some encodings need a byte order marker as the first item
|
|
|
|
// in the byte stream, to designate endian-ness. The default
|
|
|
|
// value for the byte order marker is NULL, so if this is
|
|
|
|
// the case, it's not necessary and we can just go on our
|
|
|
|
// merry way.
|
2005-01-07 20:34:46 +01:00
|
|
|
int __int_bom = __state.internal_bom();
|
2001-08-08 04:49:01 +02:00
|
|
|
if (__int_bom)
|
|
|
|
{
|
|
|
|
size_t __size = __from_end - __from;
|
2004-11-24 14:39:48 +01:00
|
|
|
intern_type* __cfixed = static_cast<intern_type*>
|
|
|
|
(__builtin_alloca(sizeof(intern_type) * (__size + 1)));
|
2001-08-08 04:49:01 +02:00
|
|
|
__cfixed[0] = static_cast<intern_type>(__int_bom);
|
|
|
|
char_traits<intern_type>::copy(__cfixed + 1, __from, __size);
|
|
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
2005-01-07 20:34:46 +01:00
|
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom,
|
2002-02-08 02:34:41 +01:00
|
|
|
&__fbytes, &__cto, &__tbytes);
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
intern_type* __cfixed = const_cast<intern_type*>(__from);
|
|
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
2005-01-07 20:34:46 +01:00
|
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom, &__fbytes,
|
2002-02-08 02:34:41 +01:00
|
|
|
&__cto, &__tbytes);
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (__conv != size_t(-1))
|
|
|
|
{
|
|
|
|
__from_next = reinterpret_cast<const intern_type*>(__cfrom);
|
|
|
|
__to_next = reinterpret_cast<extern_type*>(__cto);
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::ok;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-02-08 02:34:41 +01:00
|
|
|
if (__fbytes < __fmultiple * (__from_end - __from))
|
2001-08-08 04:49:01 +02:00
|
|
|
{
|
|
|
|
__from_next = reinterpret_cast<const intern_type*>(__cfrom);
|
|
|
|
__to_next = reinterpret_cast<extern_type*>(__cto);
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::partial;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
else
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::error;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return __ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
codecvt_base::result
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
2001-08-08 04:49:01 +02:00
|
|
|
do_unshift(state_type& __state, extern_type* __to,
|
|
|
|
extern_type* __to_end, extern_type*& __to_next) const
|
|
|
|
{
|
2003-01-16 21:30:50 +01:00
|
|
|
result __ret = codecvt_base::error;
|
2005-01-07 20:34:46 +01:00
|
|
|
if (__state.good())
|
2001-08-08 04:49:01 +02:00
|
|
|
{
|
2005-01-07 20:34:46 +01:00
|
|
|
const descriptor_type& __desc = __state.in_descriptor();
|
2002-04-01 10:55:05 +02:00
|
|
|
const size_t __tmultiple = sizeof(intern_type);
|
2001-08-08 04:49:01 +02:00
|
|
|
size_t __tlen = __tmultiple * (__to_end - __to);
|
|
|
|
|
|
|
|
// Argument list for iconv specifies a byte sequence. Thus,
|
|
|
|
// all to/from arrays must be brutally casted to char*.
|
|
|
|
char* __cto = reinterpret_cast<char*>(__to);
|
2010-06-03 21:15:56 +02:00
|
|
|
size_t __conv = __iconv_adaptor(iconv,__desc, 0, 0,
|
2001-08-08 04:49:01 +02:00
|
|
|
&__cto, &__tlen);
|
|
|
|
|
|
|
|
if (__conv != size_t(-1))
|
|
|
|
{
|
|
|
|
__to_next = reinterpret_cast<extern_type*>(__cto);
|
|
|
|
if (__tlen == __tmultiple * (__to_end - __to))
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::noconv;
|
2001-08-08 04:49:01 +02:00
|
|
|
else if (__tlen == 0)
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::ok;
|
2001-08-08 04:49:01 +02:00
|
|
|
else
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::partial;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
else
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::error;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
return __ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
codecvt_base::result
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
2001-08-08 04:49:01 +02:00
|
|
|
do_in(state_type& __state, const extern_type* __from,
|
|
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
|
|
intern_type* __to, intern_type* __to_end,
|
|
|
|
intern_type*& __to_next) const
|
|
|
|
{
|
2003-01-16 21:30:50 +01:00
|
|
|
result __ret = codecvt_base::error;
|
2005-01-07 20:34:46 +01:00
|
|
|
if (__state.good())
|
2001-08-08 04:49:01 +02:00
|
|
|
{
|
2005-01-07 20:34:46 +01:00
|
|
|
const descriptor_type& __desc = __state.in_descriptor();
|
2002-04-01 10:55:05 +02:00
|
|
|
const size_t __fmultiple = sizeof(extern_type);
|
2001-08-08 04:49:01 +02:00
|
|
|
size_t __flen = __fmultiple * (__from_end - __from);
|
2002-04-01 10:55:05 +02:00
|
|
|
const size_t __tmultiple = sizeof(intern_type);
|
2001-08-08 04:49:01 +02:00
|
|
|
size_t __tlen = __tmultiple * (__to_end - __to);
|
|
|
|
|
|
|
|
// Argument list for iconv specifies a byte sequence. Thus,
|
|
|
|
// all to/from arrays must be brutally casted to char*.
|
|
|
|
char* __cto = reinterpret_cast<char*>(__to);
|
|
|
|
char* __cfrom;
|
|
|
|
size_t __conv;
|
|
|
|
|
|
|
|
// Some encodings need a byte order marker as the first item
|
|
|
|
// in the byte stream, to designate endian-ness. The default
|
|
|
|
// value for the byte order marker is NULL, so if this is
|
|
|
|
// the case, it's not necessary and we can just go on our
|
|
|
|
// merry way.
|
2005-01-07 20:34:46 +01:00
|
|
|
int __ext_bom = __state.external_bom();
|
2001-08-08 04:49:01 +02:00
|
|
|
if (__ext_bom)
|
|
|
|
{
|
|
|
|
size_t __size = __from_end - __from;
|
2004-11-24 14:39:48 +01:00
|
|
|
extern_type* __cfixed = static_cast<extern_type*>
|
|
|
|
(__builtin_alloca(sizeof(extern_type) * (__size + 1)));
|
2001-08-08 04:49:01 +02:00
|
|
|
__cfixed[0] = static_cast<extern_type>(__ext_bom);
|
|
|
|
char_traits<extern_type>::copy(__cfixed + 1, __from, __size);
|
|
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
2005-01-07 20:34:46 +01:00
|
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom,
|
2001-08-08 04:49:01 +02:00
|
|
|
&__flen, &__cto, &__tlen);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
extern_type* __cfixed = const_cast<extern_type*>(__from);
|
|
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
2005-01-07 20:34:46 +01:00
|
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom,
|
2001-08-08 04:49:01 +02:00
|
|
|
&__flen, &__cto, &__tlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (__conv != size_t(-1))
|
|
|
|
{
|
|
|
|
__from_next = reinterpret_cast<const extern_type*>(__cfrom);
|
|
|
|
__to_next = reinterpret_cast<intern_type*>(__cto);
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::ok;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (__flen < static_cast<size_t>(__from_end - __from))
|
|
|
|
{
|
|
|
|
__from_next = reinterpret_cast<const extern_type*>(__cfrom);
|
|
|
|
__to_next = reinterpret_cast<intern_type*>(__cto);
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::partial;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
else
|
2003-01-16 21:30:50 +01:00
|
|
|
__ret = codecvt_base::error;
|
2001-08-08 04:49:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return __ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
int
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
2001-08-08 04:49:01 +02:00
|
|
|
do_encoding() const throw()
|
2002-02-08 02:34:41 +01:00
|
|
|
{
|
|
|
|
int __ret = 0;
|
|
|
|
if (sizeof(_ExternT) <= sizeof(_InternT))
|
2005-01-07 20:34:46 +01:00
|
|
|
__ret = sizeof(_InternT) / sizeof(_ExternT);
|
2002-02-08 02:34:41 +01:00
|
|
|
return __ret;
|
|
|
|
}
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
bool
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
2001-08-08 04:49:01 +02:00
|
|
|
do_always_noconv() const throw()
|
|
|
|
{ return false; }
|
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
int
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
[multiple changes]
2003-02-06 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc (test01):
Explicitly use the "C" locale.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc (test01): Same.
2003-02-06 Petur Runolfsson <peturr02@ru.is>
DR 75
DR 305
PR libstdc++/9028 (partial)
PR libstdc++/9224
PR libstdc++/9246
PR libstdc++/9247
* src/codecvt.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length):
Move...
* config/locale/generic/codecvt_members.cc: ...here.
* config/locale/gnu/codecvt_members.cc: ...and here.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding
codecvt<wchar_t, char, mbstate_t>::do_in,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length,
codecvt<wchar_t, char, mbstate_t>::do_out):
New implementation that handles stateless encodings,
including UTF-8.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc,
* config/locale/ieee_1003.1-2001/codecvt_specializations.h,
* include/bits/codecvt.h,
* src/codecvt.cc
(codecvt::length, codecvt::do_length):
Change type of first argument of length and do_length from
'const state_type&' to 'state_type&' according to DR 75.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc:
Cleanup and check for correct return value from encoding
for "C" locale.
* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/in/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/8.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/9.cc: New test.
* testsuite/22_locale/codecvt/length/char/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/char/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/out/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/unicode/1.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/unshfit/wchar_t/4.cc: New test.
From-SVN: r62474
2003-02-06 07:24:21 +01:00
|
|
|
do_length(state_type&, const extern_type* __from,
|
2001-08-08 04:49:01 +02:00
|
|
|
const extern_type* __end, size_t __max) const
|
2002-12-16 19:23:00 +01:00
|
|
|
{ return std::min(__max, static_cast<size_t>(__end - __from)); }
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2003-10-12 12:12:09 +02:00
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 74. Garbled text for codecvt::do_max_length
|
2001-08-08 04:49:01 +02:00
|
|
|
template<typename _InternT, typename _ExternT>
|
|
|
|
int
|
2005-01-07 20:34:46 +01:00
|
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
2001-08-08 04:49:01 +02:00
|
|
|
do_max_length() const throw()
|
|
|
|
{ return 1; }
|
2005-12-19 01:56:05 +01:00
|
|
|
|
PR libstdc++/36104 part four
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
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2003-10-12 12:12:09 +02:00
|
|
|
|
2006-07-11 19:48:10 +02:00
|
|
|
#endif
|