gcc/libstdc++-v3/config/locale/gnu/codecvt_members.cc

308 lines
8.7 KiB
C++
Raw Normal View History

// std::codecvt implementation details, GNU version -*- C++ -*-
// Copyright (C) 2002-2016 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/>.
//
// ISO C++ 14882: 22.2.1.5 - Template class codecvt
//
// Written by Benjamin Kosnik <bkoz@redhat.com>
#include <locale>
#include <cstdlib> // For MB_CUR_MAX
#include <climits> // For MB_LEN_MAX
configure.in (GLIBCPP_ENABLE_DEBUG): Default to none. 2002-12-16 Benjamin Kosnik <bkoz@redhat.com> * configure.in (GLIBCPP_ENABLE_DEBUG): Default to none. Call GLIBCPP_ENABLE_DEBUG_FLAGS. * acinclude.m4 (GLIBCPP_ENABLE_DEBUG): GLIBCPP_BUILD_DEBUG, new conditional if --enable-debug is yes. Rework. (GLIBCPP_ENABLE_DEBUG_FLAGS): New. * aclocal.m4: Regenerate. * libio/Makefile.am: Remove DEBUG_FLAGS. * libio/Makefile.in: Regenerate. * libsupc++/Makefile.am: Remove DEBUG_FLAGS. * libsupc++/Makefile.in: Regenerate. * docs/html/configopts.html: Add docs for --enable-debug, --enable-debug-flags. 2002-12-16 Benjamin Kosnik <bkoz@redhat.com> Correct dependency tracking, build warts. * configure.in: Correct repeated AC_OUTPUT thrashing by config-ml.in * configure: Regenerate. * include/Makefile.am (stamp-target): Stamp in top_builddir. * include/Makefile.in: Regenerate. * src/Makefile.am (codecvt_members.cc): New rule. (collate_members.cc): Same. (ctype_members.cc): Same. (messages_members.cc): Same. (monetary_members.cc): Same. (numeric_members.cc): Same. (time_members.cc): Same. (c++locale.cc): Same. (basic_file.cc): Same. * src/Makefile.in: Regenerate. * acinclude.m4 (CCTYPE_CHAR_CC): Remove. (CCCODECVT_CC): Don't link, AC_SUBST. (CCOLLATE_CC): Same. (CCTYPE_CC): Same. (CMESSAGES_CC): Same. (CMONEY_CC): Same. (CNUMERIC_CC): Same. (CTIME_CC): Same. (CLOCALE_CC): Same. * aclocal.m4: Regenerate. * src/Makefile.am (libstdc___la_LIBADD): Use top_builddir for convenience libraries. (version_arg): Rename linker.map to libstdc++.ver. (libstdc___la_DEPENDENCIES): Remove linker.map, add libstdc++-symbol.ver as a dependency. (libstdc++-symbol.ver): Add rule. * acinclude.m4 (GLIBCPP_ENABLE_SYMVERS): Change LINKER_MAP to SYMVER_MAP. Don't link, AC_SUBST. * include/Makefile.am (target_headers_noinst): New. (stamp-target): Add CLOCALE_INTERNAL_H. * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Don't link CLOCALE_INTERNAL_H, AC_SUBST. * config/locale/gnu/c_locale.cc: Modify c++locale_internal.h include. * config/locale/gnu/time_members.cc: Same. * config/locale/gnu/numeric_members.cc: Same. * config/locale/gnu/monetary_members.cc: Same. * config/locale/gnu/messages_members.cc: Same. * config/locale/gnu/ctype_members.cc: Same. * config/locale/gnu/collate_members.cc: Same. * config/locale/gnu/codecvt_members.cc: Same. * config/locale/generic/codecvt_members.cc: Remove. From-SVN: r60177
2002-12-16 20:02:01 +01:00
#include <bits/c++locale_internal.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 std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
c++config: Add in revised namespace associations. 2005-12-18 Benjamin Kosnik <bkoz@redhat.com> * include/bits/c++config: Add in revised namespace associations. _GLIBCXX_BEGIN_NAMESPACE: New macro. _GLIBCXX_END_NAMESPACE: Same. _GLIBCXX_BEGIN_NESTED_NAMESPACE: Same. _GLIBCXX_END_NESTED_NAMESPACE: Same. * acinclude.m4 (GLIBCXX_ENABLE_SYMVERS]): Add gnu-versioned-namespace. * configure: Regenerated. * config.h.in: Same. * config/abi/pre/gnu-versioned-namespace.ver: New. * config/abi/pre/gnu.ver (GLIBCXX_3.4.7): Add exports for nested debug mode items. * include/Makefile.am (${host_builddir}/c++config.h): Fill in values for __GLIBCXX__ and _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION. * include/Makefile.in: Regnerate. * src/compatibility.cc: Alias new, nested definitions to exported symbols from non-nested __gnu_debug. * src/Makefile.am: Add in ENABLE_SYMVERS_GNU_NAMESPACE. * src/Makefile.in: Regenerate. * docs/html/debug_mode.html: Revise for nested design. * docs/html/debug.html: Use debug qualifications instead of __gnu_debug. * docs/html/configopts.html: Revise documentation for --enable-symvers. * include/debug/formatter: Simplify namespace qualifications for current, nested-only reality. Add top-level namespace alias, namespace debug, for debug-mode containers. * include/debug/safe_iterator.h: Same. * include/debug/set.h: Same. * include/debug/hash_multimap.h: Same. * include/debug/hash_set.h: Same. * include/debug/bitset * include/debug/safe_sequence.h: Same. * include/debug/multiset.h: Same. * include/debug/safe_base.h: Same. * include/debug/functions.h: Same. * include/debug/safe_iterator.tcc * include/debug/hash_multiset.h: Same. * include/debug/vector * include/debug/map.h: Same. * include/debug/deque * include/debug/hash_map.h: Same. * include/debug/string * include/debug/macros.h: Same. * include/debug/list * include/debug/debug.h: Same. * include/debug/multimap.h: Same. * src/debug.cc: Same. * testsuite/23_containers/vector/invalidation/1.cc: Cleanups. * testsuite/23_containers/vector/invalidation/2.cc: Same. * testsuite/23_containers/vector/invalidation/3.cc: Same. * testsuite/23_containers/vector/invalidation/4.cc: Same. * testsuite/23_containers/deque/invalidation/1.cc: Same. * testsuite/23_containers/deque/invalidation/2.cc: Same. * testsuite/23_containers/deque/invalidation/3.cc: Same. * testsuite/23_containers/deque/invalidation/4.cc: Same. * testsuite/23_containers/multiset/invalidation/1.cc: Same. * testsuite/23_containers/multiset/invalidation/2.cc: Same. * testsuite/23_containers/multimap/invalidation/1.cc: Same. * testsuite/23_containers/multimap/invalidation/2.cc: Same. * testsuite/23_containers/bitset/invalidation/1.cc: Same. * testsuite/23_containers/bitset/cons/16020.cc: Same. * testsuite/23_containers/bitset/operations/13838.cc: Same. * testsuite/23_containers/list/invalidation/1.cc: Same. * testsuite/23_containers/list/invalidation/2.cc: Same. * testsuite/23_containers/list/invalidation/3.cc: Same. * testsuite/23_containers/list/invalidation/4.cc: Same. * testsuite/23_containers/set/invalidation/1.cc: Same. * testsuite/23_containers/set/invalidation/2.cc: Same. * testsuite/23_containers/map/invalidation/1.cc: Same. * testsuite/23_containers/map/invalidation/2.cc: Same. * testsuite/23_containers/map/insert/16813.cc: Same. * include/bits/basic_ios.h: Use _GLIBCXX_BEGIN_NAMESPACE(std) and friends. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/stl_algobase.h: Same. * include/bits/localefwd.h: Same. * include/bits/valarray_array.tcc: Same. * include/bits/valarray_after.h: Same. * include/bits/gslice_array.h: Same. * include/bits/stl_queue.h: Same. * include/bits/gslice.h: Same. * include/bits/locale_facets.tcc: Same. * include/bits/locale_classes.h: Same. * include/bits/stl_set.h: Same. * include/bits/locale_facets.h: Same. * include/bits/stl_stack.h: Same. * include/bits/stl_iterator_base_types.h: Same. * include/bits/stl_heap.h: Same. * include/bits/indirect_array.h: Same. * include/bits/atomicity.h: Same. * include/bits/stream_iterator.h: Same. * include/bits/concurrence.h: Same. * include/bits/basic_string.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_pair.h: Same. * include/bits/basic_ios.tcc: Same. * include/bits/stl_raw_storage_iter.h: Same. * include/bits/stl_vector.h: Same. * include/bits/stl_numeric.h: Same. * include/bits/ios_base.h: Same. * include/bits/stl_deque.h: Same. * include/bits/istream.tcc: Same. * include/bits/postypes.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/mask_array.h: Same. * include/bits/stl_uninitialized.h: Same. * include/bits/ostream.tcc: Same. * include/bits/slice_array.h: Same. * include/bits/boost_concept_check.h: Same. * include/bits/sstream.tcc: Same. * include/bits/stl_iterator_base_funcs.h: Same. * include/bits/char_traits.h: Same. * include/bits/stl_algo.h: Same. * include/bits/stringfwd.h: Same. * include/bits/c++config * include/bits/stl_iterator.h: Same. * include/bits/valarray_array.h: Same. * include/bits/stl_tempbuf.h: Same. * include/bits/vector.tcc: Same. * include/bits/deque.tcc: Same. * include/bits/stl_bvector.h: Same. * include/bits/basic_string.tcc: Same. * include/bits/list.tcc: Same. * include/bits/streambuf_iterator.h: Same. * include/bits/valarray_before.h: Same. * include/bits/stl_construct.h: Same. * include/bits/stl_function.h: Same. * include/bits/cpp_type_traits.h: Same. * include/bits/streambuf.tcc: Same. * include/bits/allocator.h: Same. * include/bits/stl_tree.h: Same. * include/bits/fstream.tcc: Same. * include/bits/stl_relops.h: Same. * include/bits/functexcept.h: Same. * include/std/std_valarray.h: Same. * include/std/std_iostream.h: Same. * include/std/std_streambuf.h: Same. * include/std/std_bitset.h: Same. * include/std/std_iosfwd.h: Same. * include/std/std_iomanip.h: Same. * include/std/std_fstream.h: Same. * include/std/std_limits.h: Same. * include/std/std_stdexcept.h: Same. * include/std/std_istream.h: Same. * include/std/std_complex.h: Same. * include/std/std_memory.h: Same. * include/std/std_ostream.h: Same. * include/std/std_sstream.h: Same. * include/c_std/std_csignal.h: Same. * include/c_std/std_cstdlib.h: Same. * include/c_std/std_cstdio.h: Same. * include/c_std/std_cstdarg.h: Same. * include/c_std/std_cctype.h: Same. * include/c_std/std_cmath.h: Same. * include/c_std/std_ctime.h: Same. * include/c_std/std_clocale.h: Same. * include/c_std/std_csetjmp.h: Same. * include/c_std/std_cwchar.h: Same. * include/c_std/std_cstring.h: Same. * include/c_std/std_cstddef.h: Same. * include/c_std/std_cwctype.h: Same. * include/backward/iterator.h: Same. * include/backward/set.h: Same. * include/backward/hashtable.h: Same. * include/backward/fstream.h: Same. * include/backward/tempbuf.h: Same. * include/backward/istream.h: Same. * include/backward/bvector.h: Same. * include/backward/stack.h: Same. * include/backward/rope.h: Same. * include/backward/complex.h: Same. * include/backward/ostream.h: Same. * include/backward/heap.h: Same. * include/backward/iostream.h: Same. * include/backward/function.h: Same. * include/backward/multimap.h: Same. * include/backward/pair.h: Same. * include/backward/stream.h: Same. * include/backward/iomanip.h: Same. * include/backward/strstream * include/backward/slist.h: Same. * include/backward/tree.h: Same. * include/backward/vector.h: Same. * include/backward/deque.h: Same. * include/backward/multiset.h: Same. * include/backward/list.h: Same. * include/backward/map.h: Same. * include/backward/algobase.h: Same. * include/backward/hash_map.h: Same. * include/backward/algo.h: Same. * include/backward/queue.h: Same. * include/backward/streambuf.h: Same. * src/allocator-inst.cc: Same. * src/complex_io.cc: Same. * src/localename.cc: Same. * src/limits.cc: Same. * src/ios_failure.cc: Same. * src/locale-misc-inst.cc: Same. * src/streambuf-inst.cc: Same. * src/misc-inst.cc: Same. * src/concept-inst.cc: Same. * src/ios_locale.cc: Same. * src/pool_allocator.cc: Same. * src/fstream-inst.cc: Same. * src/istream-inst.cc: Same. * src/string-inst.cc: Same. * src/locale_init.cc: Same. * src/ctype.cc: Same. * src/strstream.cc: Same. * src/ostream-inst.cc: Same. * src/functexcept.cc: Same. * src/streambuf.cc: Same. * src/sstream-inst.cc: Same. * src/ios.cc: Same. * src/valarray-inst.cc: Same. * src/locale.cc: Same. * src/tree.cc: Same. * src/stdexcept.cc: Same. * src/istream.cc: Same. * src/compatibility.cc: Same. * src/locale-inst.cc: Same. * src/globals_io.cc: Same. * src/list.cc: Same. * src/ios_init.cc: Same. * src/locale_facets.cc: Same. * src/codecvt.cc: Same. * include/tr1/unordered_map: Use _GLIBCXX_BEGIN_NAMESPACE(tr1). * include/tr1/boost_shared_ptr.h: Same. * include/tr1/tuple * include/tr1/hashtable * include/tr1/type_traits_fwd.h: Same. * include/tr1/unordered_set * include/tr1/functional * include/tr1/ref_fwd.h: Same. * include/tr1/utility * include/tr1/type_traits * include/tr1/array * include/ext/hashtable.h: Use _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx). * include/ext/typelist.h: Same. * include/ext/hash_map: Same. * include/ext/rc_string_base.h: Same. * include/ext/pool_allocator.h: Same. * include/ext/iterator: Same. * include/ext/rb_tree: Same. * include/ext/numeric: Same. * include/ext/vstring.tcc: Same. * include/ext/sso_string_base.h: Same. * include/ext/stdio_filebuf.h: Same. * include/ext/algorithm: Same. * include/ext/codecvt_specializations.h: Same. * include/ext/new_allocator.h: Same. * include/ext/array_allocator.h: Same. * include/ext/vstring_util.h: Same. * include/ext/vstring_fwd.h: Same. * include/ext/mt_allocator.h: Same. * include/ext/debug_allocator.h: Same. * include/ext/slist: Same. * include/ext/stdio_sync_filebuf.h: Same. * include/ext/hash_fun.h: Same. * include/ext/malloc_allocator.h: Same. * include/ext/functional: Same. * include/ext/bitmap_allocator.h: Same. * include/ext/pod_char_traits.h: Same. * include/ext/vstring.h: Same. * include/ext/ropeimpl.h: Same. * include/ext/hash_set: Same. * include/ext/memory: Same. * include/ext/rope: Same. * include/bits/boost_concept_check.h: Same. * include/bits/stl_iterator.h: Same. * include/bits/char_traits.h: Same. * include/bits/cpp_type_traits.h: Same. * include/bits/concurrence.h: Same. * include/bits/atomicity.h: Same. * config/locale/gnu/numeric_members.cc: Same. * config/locale/gnu/collate_members.cc: Same. * config/locale/gnu/ctype_members.cc: Same. * config/locale/gnu/c_locale.cc: Same. * config/locale/gnu/codecvt_members.cc: Same. * config/locale/gnu/messages_members.cc: Same. * config/locale/gnu/c_locale.h: Same. * config/locale/gnu/monetary_members.cc: Same. * config/locale/gnu/time_members.cc: Same. * config/locale/ieee_1003.1-2001/c_locale.h: Same. * config/locale/generic/numeric_members.cc: Same. * config/locale/generic/collate_members.cc: Same. * config/locale/generic/ctype_members.cc: Same. * config/locale/generic/c_locale.cc: Same. * config/locale/generic/codecvt_members.cc: Same. * config/locale/generic/messages_members.cc: Same. * config/locale/generic/c_locale.h: Same. * config/locale/generic/monetary_members.cc: Same. * config/locale/generic/time_members.cc: Same. * config/os/aix/atomicity.h: Same. * config/os/irix/atomicity.h: Same. * config/cpu/powerpc/atomicity.h: Same. * config/cpu/cris/atomicity.h: Same. * config/cpu/ia64/atomicity.h: Same. * config/cpu/alpha/atomicity.h: Same. * config/cpu/m68k/atomicity.h: Same. * config/cpu/hppa/atomicity.h: Same. * config/cpu/mips/atomicity.h: Same. * config/cpu/sparc/atomicity.h: Same. * config/cpu/i386/atomicity.h: Same. * config/cpu/i486/atomicity.h: Same. * config/cpu/sh/atomicity.h: Same. * config/cpu/generic/atomicity.h: Same. * config/cpu/s390/atomicity.h: Same. * config/io/c_io_stdio.h: Same. * config/io/basic_file_stdio.cc: Same. * config/io/basic_file_stdio.h: Same. * src/misc-inst.cc: Same. * src/concept-inst.cc: Same. * src/ext-inst.cc: Same. * src/string-inst.cc: Same. * src/pool_allocator.cc: Same. * src/bitmap_allocator.cc: Same. * src/mt_allocator.cc: Same. * libsupc++/exception: Same. * libsupc++/vterminate.cc: Same. * testsuite/ext/hash_map/1.cc: Explicitly qualify __gnu_cxx::hash_map. * testsuite/ext/hash_map/14648.cc: Same. * libsupc++/eh_alloc.cc: Correct comment line spacing. From-SVN: r108775
2005-12-19 01:56:05 +01:00
// Specializations.
#ifdef _GLIBCXX_USE_WCHAR_T
codecvt_base::result
codecvt<wchar_t, char, mbstate_t>::
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
{
[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
result __ret = ok;
state_type __tmp_state(__state);
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__c_locale __old = __uselocale(_M_c_locale_codecvt);
#endif
[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
// wcsnrtombs is *very* fast but stops if encounters NUL characters:
// in case we fall back to wcrtomb and then continue, in a loop.
// NB: wcsnrtombs is a GNU extension
for (__from_next = __from, __to_next = __to;
__from_next < __from_end && __to_next < __to_end
&& __ret == ok;)
[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
{
const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
__from_end - __from_next);
if (!__from_chunk_end)
__from_chunk_end = __from_end;
__from = __from_next;
const size_t __conv = wcsnrtombs(__to_next, &__from_next,
__from_chunk_end - __from_next,
__to_end - __to_next, &__state);
if (__conv == static_cast<size_t>(-1))
{
// In case of error, in order to stop at the exact place we
// have to start again from the beginning with a series of
// wcrtomb.
for (; __from < __from_next; ++__from)
__to_next += wcrtomb(__to_next, *__from, &__tmp_state);
__state = __tmp_state;
__ret = error;
}
else if (__from_next && __from_next < __from_chunk_end)
{
__to_next += __conv;
__ret = partial;
}
else
[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
{
__from_next = __from_chunk_end;
__to_next += __conv;
}
if (__from_next < __from_end && __ret == ok)
{
extern_type __buf[MB_LEN_MAX];
__tmp_state = __state;
const size_t __conv2 = wcrtomb(__buf, *__from_next, &__tmp_state);
if (__conv2 > static_cast<size_t>(__to_end - __to_next))
__ret = partial;
else
{
memcpy(__to_next, __buf, __conv2);
__state = __tmp_state;
__to_next += __conv2;
++__from_next;
}
[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
}
}
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__uselocale(__old);
#endif
return __ret;
}
codecvt_base::result
codecvt<wchar_t, char, mbstate_t>::
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
{
[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
result __ret = ok;
state_type __tmp_state(__state);
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__c_locale __old = __uselocale(_M_c_locale_codecvt);
#endif
[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
// mbsnrtowcs is *very* fast but stops if encounters NUL characters:
// in case we store a L'\0' and then continue, in a loop.
// NB: mbsnrtowcs is a GNU extension
for (__from_next = __from, __to_next = __to;
__from_next < __from_end && __to_next < __to_end
&& __ret == ok;)
[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
{
const extern_type* __from_chunk_end;
__from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
__from_end
- __from_next));
if (!__from_chunk_end)
__from_chunk_end = __from_end;
__from = __from_next;
size_t __conv = mbsnrtowcs(__to_next, &__from_next,
__from_chunk_end - __from_next,
__to_end - __to_next, &__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
if (__conv == static_cast<size_t>(-1))
{
// In case of error, in order to stop at the exact place we
// have to start again from the beginning with a series of
// mbrtowc.
for (;; ++__to_next, __from += __conv)
{
__conv = mbrtowc(__to_next, __from, __from_end - __from,
&__tmp_state);
if (__conv == static_cast<size_t>(-1)
|| __conv == static_cast<size_t>(-2))
break;
}
__from_next = __from;
__state = __tmp_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
__ret = error;
}
else if (__from_next && __from_next < __from_chunk_end)
[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
{
// It is unclear what to return in this case (see DR 382).
__to_next += __conv;
[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
__ret = partial;
}
else
[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
{
__from_next = __from_chunk_end;
__to_next += __conv;
[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
}
if (__from_next < __from_end && __ret == ok)
{
if (__to_next < __to_end)
{
// XXX Probably wrong for stateful encodings
__tmp_state = __state;
++__from_next;
*__to_next++ = L'\0';
}
else
__ret = partial;
}
[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
}
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__uselocale(__old);
#endif
[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
return __ret;
}
int
codecvt<wchar_t, char, mbstate_t>::
do_encoding() const throw()
{
// XXX This implementation assumes that the encoding is
// stateless and is either single-byte or variable-width.
int __ret = 0;
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__c_locale __old = __uselocale(_M_c_locale_codecvt);
#endif
if (MB_CUR_MAX == 1)
__ret = 1;
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__uselocale(__old);
#endif
return __ret;
}
int
codecvt<wchar_t, char, mbstate_t>::
do_max_length() const throw()
{
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__c_locale __old = __uselocale(_M_c_locale_codecvt);
#endif
// XXX Probably wrong for stateful encodings.
int __ret = MB_CUR_MAX;
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__uselocale(__old);
#endif
return __ret;
}
int
codecvt<wchar_t, char, mbstate_t>::
do_length(state_type& __state, const extern_type* __from,
const extern_type* __end, size_t __max) const
{
int __ret = 0;
state_type __tmp_state(__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
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__c_locale __old = __uselocale(_M_c_locale_codecvt);
#endif
// mbsnrtowcs is *very* fast but stops if encounters NUL characters:
// in case we advance past it and then continue, in a loop.
// NB: mbsnrtowcs is a GNU extension
// A dummy internal buffer is needed in order for mbsnrtocws to consider
// its fourth parameter (it wouldn't with NULL as first parameter).
wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
* __max));
[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
while (__from < __end && __max)
{
const extern_type* __from_chunk_end;
__from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
__end
- __from));
if (!__from_chunk_end)
__from_chunk_end = __end;
const extern_type* __tmp_from = __from;
size_t __conv = mbsnrtowcs(__to, &__from,
__from_chunk_end - __from,
__max, &__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
if (__conv == static_cast<size_t>(-1))
{
// In case of error, in order to stop at the exact place we
// have to start again from the beginning with a series of
// mbrtowc.
for (__from = __tmp_from;; __from += __conv)
{
__conv = mbrtowc(0, __from, __end - __from,
&__tmp_state);
if (__conv == static_cast<size_t>(-1)
|| __conv == static_cast<size_t>(-2))
break;
}
__state = __tmp_state;
__ret += __from - __tmp_from;
[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
break;
}
if (!__from)
__from = __from_chunk_end;
__ret += __from - __tmp_from;
__max -= __conv;
if (__from < __end && __max)
[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
{
// XXX Probably wrong for stateful encodings
__tmp_state = __state;
++__from;
++__ret;
--__max;
[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
}
}
[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
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__uselocale(__old);
#endif
return __ret;
}
#endif
c++config: Add in revised namespace associations. 2005-12-18 Benjamin Kosnik <bkoz@redhat.com> * include/bits/c++config: Add in revised namespace associations. _GLIBCXX_BEGIN_NAMESPACE: New macro. _GLIBCXX_END_NAMESPACE: Same. _GLIBCXX_BEGIN_NESTED_NAMESPACE: Same. _GLIBCXX_END_NESTED_NAMESPACE: Same. * acinclude.m4 (GLIBCXX_ENABLE_SYMVERS]): Add gnu-versioned-namespace. * configure: Regenerated. * config.h.in: Same. * config/abi/pre/gnu-versioned-namespace.ver: New. * config/abi/pre/gnu.ver (GLIBCXX_3.4.7): Add exports for nested debug mode items. * include/Makefile.am (${host_builddir}/c++config.h): Fill in values for __GLIBCXX__ and _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION. * include/Makefile.in: Regnerate. * src/compatibility.cc: Alias new, nested definitions to exported symbols from non-nested __gnu_debug. * src/Makefile.am: Add in ENABLE_SYMVERS_GNU_NAMESPACE. * src/Makefile.in: Regenerate. * docs/html/debug_mode.html: Revise for nested design. * docs/html/debug.html: Use debug qualifications instead of __gnu_debug. * docs/html/configopts.html: Revise documentation for --enable-symvers. * include/debug/formatter: Simplify namespace qualifications for current, nested-only reality. Add top-level namespace alias, namespace debug, for debug-mode containers. * include/debug/safe_iterator.h: Same. * include/debug/set.h: Same. * include/debug/hash_multimap.h: Same. * include/debug/hash_set.h: Same. * include/debug/bitset * include/debug/safe_sequence.h: Same. * include/debug/multiset.h: Same. * include/debug/safe_base.h: Same. * include/debug/functions.h: Same. * include/debug/safe_iterator.tcc * include/debug/hash_multiset.h: Same. * include/debug/vector * include/debug/map.h: Same. * include/debug/deque * include/debug/hash_map.h: Same. * include/debug/string * include/debug/macros.h: Same. * include/debug/list * include/debug/debug.h: Same. * include/debug/multimap.h: Same. * src/debug.cc: Same. * testsuite/23_containers/vector/invalidation/1.cc: Cleanups. * testsuite/23_containers/vector/invalidation/2.cc: Same. * testsuite/23_containers/vector/invalidation/3.cc: Same. * testsuite/23_containers/vector/invalidation/4.cc: Same. * testsuite/23_containers/deque/invalidation/1.cc: Same. * testsuite/23_containers/deque/invalidation/2.cc: Same. * testsuite/23_containers/deque/invalidation/3.cc: Same. * testsuite/23_containers/deque/invalidation/4.cc: Same. * testsuite/23_containers/multiset/invalidation/1.cc: Same. * testsuite/23_containers/multiset/invalidation/2.cc: Same. * testsuite/23_containers/multimap/invalidation/1.cc: Same. * testsuite/23_containers/multimap/invalidation/2.cc: Same. * testsuite/23_containers/bitset/invalidation/1.cc: Same. * testsuite/23_containers/bitset/cons/16020.cc: Same. * testsuite/23_containers/bitset/operations/13838.cc: Same. * testsuite/23_containers/list/invalidation/1.cc: Same. * testsuite/23_containers/list/invalidation/2.cc: Same. * testsuite/23_containers/list/invalidation/3.cc: Same. * testsuite/23_containers/list/invalidation/4.cc: Same. * testsuite/23_containers/set/invalidation/1.cc: Same. * testsuite/23_containers/set/invalidation/2.cc: Same. * testsuite/23_containers/map/invalidation/1.cc: Same. * testsuite/23_containers/map/invalidation/2.cc: Same. * testsuite/23_containers/map/insert/16813.cc: Same. * include/bits/basic_ios.h: Use _GLIBCXX_BEGIN_NAMESPACE(std) and friends. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/stl_algobase.h: Same. * include/bits/localefwd.h: Same. * include/bits/valarray_array.tcc: Same. * include/bits/valarray_after.h: Same. * include/bits/gslice_array.h: Same. * include/bits/stl_queue.h: Same. * include/bits/gslice.h: Same. * include/bits/locale_facets.tcc: Same. * include/bits/locale_classes.h: Same. * include/bits/stl_set.h: Same. * include/bits/locale_facets.h: Same. * include/bits/stl_stack.h: Same. * include/bits/stl_iterator_base_types.h: Same. * include/bits/stl_heap.h: Same. * include/bits/indirect_array.h: Same. * include/bits/atomicity.h: Same. * include/bits/stream_iterator.h: Same. * include/bits/concurrence.h: Same. * include/bits/basic_string.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_pair.h: Same. * include/bits/basic_ios.tcc: Same. * include/bits/stl_raw_storage_iter.h: Same. * include/bits/stl_vector.h: Same. * include/bits/stl_numeric.h: Same. * include/bits/ios_base.h: Same. * include/bits/stl_deque.h: Same. * include/bits/istream.tcc: Same. * include/bits/postypes.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/mask_array.h: Same. * include/bits/stl_uninitialized.h: Same. * include/bits/ostream.tcc: Same. * include/bits/slice_array.h: Same. * include/bits/boost_concept_check.h: Same. * include/bits/sstream.tcc: Same. * include/bits/stl_iterator_base_funcs.h: Same. * include/bits/char_traits.h: Same. * include/bits/stl_algo.h: Same. * include/bits/stringfwd.h: Same. * include/bits/c++config * include/bits/stl_iterator.h: Same. * include/bits/valarray_array.h: Same. * include/bits/stl_tempbuf.h: Same. * include/bits/vector.tcc: Same. * include/bits/deque.tcc: Same. * include/bits/stl_bvector.h: Same. * include/bits/basic_string.tcc: Same. * include/bits/list.tcc: Same. * include/bits/streambuf_iterator.h: Same. * include/bits/valarray_before.h: Same. * include/bits/stl_construct.h: Same. * include/bits/stl_function.h: Same. * include/bits/cpp_type_traits.h: Same. * include/bits/streambuf.tcc: Same. * include/bits/allocator.h: Same. * include/bits/stl_tree.h: Same. * include/bits/fstream.tcc: Same. * include/bits/stl_relops.h: Same. * include/bits/functexcept.h: Same. * include/std/std_valarray.h: Same. * include/std/std_iostream.h: Same. * include/std/std_streambuf.h: Same. * include/std/std_bitset.h: Same. * include/std/std_iosfwd.h: Same. * include/std/std_iomanip.h: Same. * include/std/std_fstream.h: Same. * include/std/std_limits.h: Same. * include/std/std_stdexcept.h: Same. * include/std/std_istream.h: Same. * include/std/std_complex.h: Same. * include/std/std_memory.h: Same. * include/std/std_ostream.h: Same. * include/std/std_sstream.h: Same. * include/c_std/std_csignal.h: Same. * include/c_std/std_cstdlib.h: Same. * include/c_std/std_cstdio.h: Same. * include/c_std/std_cstdarg.h: Same. * include/c_std/std_cctype.h: Same. * include/c_std/std_cmath.h: Same. * include/c_std/std_ctime.h: Same. * include/c_std/std_clocale.h: Same. * include/c_std/std_csetjmp.h: Same. * include/c_std/std_cwchar.h: Same. * include/c_std/std_cstring.h: Same. * include/c_std/std_cstddef.h: Same. * include/c_std/std_cwctype.h: Same. * include/backward/iterator.h: Same. * include/backward/set.h: Same. * include/backward/hashtable.h: Same. * include/backward/fstream.h: Same. * include/backward/tempbuf.h: Same. * include/backward/istream.h: Same. * include/backward/bvector.h: Same. * include/backward/stack.h: Same. * include/backward/rope.h: Same. * include/backward/complex.h: Same. * include/backward/ostream.h: Same. * include/backward/heap.h: Same. * include/backward/iostream.h: Same. * include/backward/function.h: Same. * include/backward/multimap.h: Same. * include/backward/pair.h: Same. * include/backward/stream.h: Same. * include/backward/iomanip.h: Same. * include/backward/strstream * include/backward/slist.h: Same. * include/backward/tree.h: Same. * include/backward/vector.h: Same. * include/backward/deque.h: Same. * include/backward/multiset.h: Same. * include/backward/list.h: Same. * include/backward/map.h: Same. * include/backward/algobase.h: Same. * include/backward/hash_map.h: Same. * include/backward/algo.h: Same. * include/backward/queue.h: Same. * include/backward/streambuf.h: Same. * src/allocator-inst.cc: Same. * src/complex_io.cc: Same. * src/localename.cc: Same. * src/limits.cc: Same. * src/ios_failure.cc: Same. * src/locale-misc-inst.cc: Same. * src/streambuf-inst.cc: Same. * src/misc-inst.cc: Same. * src/concept-inst.cc: Same. * src/ios_locale.cc: Same. * src/pool_allocator.cc: Same. * src/fstream-inst.cc: Same. * src/istream-inst.cc: Same. * src/string-inst.cc: Same. * src/locale_init.cc: Same. * src/ctype.cc: Same. * src/strstream.cc: Same. * src/ostream-inst.cc: Same. * src/functexcept.cc: Same. * src/streambuf.cc: Same. * src/sstream-inst.cc: Same. * src/ios.cc: Same. * src/valarray-inst.cc: Same. * src/locale.cc: Same. * src/tree.cc: Same. * src/stdexcept.cc: Same. * src/istream.cc: Same. * src/compatibility.cc: Same. * src/locale-inst.cc: Same. * src/globals_io.cc: Same. * src/list.cc: Same. * src/ios_init.cc: Same. * src/locale_facets.cc: Same. * src/codecvt.cc: Same. * include/tr1/unordered_map: Use _GLIBCXX_BEGIN_NAMESPACE(tr1). * include/tr1/boost_shared_ptr.h: Same. * include/tr1/tuple * include/tr1/hashtable * include/tr1/type_traits_fwd.h: Same. * include/tr1/unordered_set * include/tr1/functional * include/tr1/ref_fwd.h: Same. * include/tr1/utility * include/tr1/type_traits * include/tr1/array * include/ext/hashtable.h: Use _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx). * include/ext/typelist.h: Same. * include/ext/hash_map: Same. * include/ext/rc_string_base.h: Same. * include/ext/pool_allocator.h: Same. * include/ext/iterator: Same. * include/ext/rb_tree: Same. * include/ext/numeric: Same. * include/ext/vstring.tcc: Same. * include/ext/sso_string_base.h: Same. * include/ext/stdio_filebuf.h: Same. * include/ext/algorithm: Same. * include/ext/codecvt_specializations.h: Same. * include/ext/new_allocator.h: Same. * include/ext/array_allocator.h: Same. * include/ext/vstring_util.h: Same. * include/ext/vstring_fwd.h: Same. * include/ext/mt_allocator.h: Same. * include/ext/debug_allocator.h: Same. * include/ext/slist: Same. * include/ext/stdio_sync_filebuf.h: Same. * include/ext/hash_fun.h: Same. * include/ext/malloc_allocator.h: Same. * include/ext/functional: Same. * include/ext/bitmap_allocator.h: Same. * include/ext/pod_char_traits.h: Same. * include/ext/vstring.h: Same. * include/ext/ropeimpl.h: Same. * include/ext/hash_set: Same. * include/ext/memory: Same. * include/ext/rope: Same. * include/bits/boost_concept_check.h: Same. * include/bits/stl_iterator.h: Same. * include/bits/char_traits.h: Same. * include/bits/cpp_type_traits.h: Same. * include/bits/concurrence.h: Same. * include/bits/atomicity.h: Same. * config/locale/gnu/numeric_members.cc: Same. * config/locale/gnu/collate_members.cc: Same. * config/locale/gnu/ctype_members.cc: Same. * config/locale/gnu/c_locale.cc: Same. * config/locale/gnu/codecvt_members.cc: Same. * config/locale/gnu/messages_members.cc: Same. * config/locale/gnu/c_locale.h: Same. * config/locale/gnu/monetary_members.cc: Same. * config/locale/gnu/time_members.cc: Same. * config/locale/ieee_1003.1-2001/c_locale.h: Same. * config/locale/generic/numeric_members.cc: Same. * config/locale/generic/collate_members.cc: Same. * config/locale/generic/ctype_members.cc: Same. * config/locale/generic/c_locale.cc: Same. * config/locale/generic/codecvt_members.cc: Same. * config/locale/generic/messages_members.cc: Same. * config/locale/generic/c_locale.h: Same. * config/locale/generic/monetary_members.cc: Same. * config/locale/generic/time_members.cc: Same. * config/os/aix/atomicity.h: Same. * config/os/irix/atomicity.h: Same. * config/cpu/powerpc/atomicity.h: Same. * config/cpu/cris/atomicity.h: Same. * config/cpu/ia64/atomicity.h: Same. * config/cpu/alpha/atomicity.h: Same. * config/cpu/m68k/atomicity.h: Same. * config/cpu/hppa/atomicity.h: Same. * config/cpu/mips/atomicity.h: Same. * config/cpu/sparc/atomicity.h: Same. * config/cpu/i386/atomicity.h: Same. * config/cpu/i486/atomicity.h: Same. * config/cpu/sh/atomicity.h: Same. * config/cpu/generic/atomicity.h: Same. * config/cpu/s390/atomicity.h: Same. * config/io/c_io_stdio.h: Same. * config/io/basic_file_stdio.cc: Same. * config/io/basic_file_stdio.h: Same. * src/misc-inst.cc: Same. * src/concept-inst.cc: Same. * src/ext-inst.cc: Same. * src/string-inst.cc: Same. * src/pool_allocator.cc: Same. * src/bitmap_allocator.cc: Same. * src/mt_allocator.cc: Same. * libsupc++/exception: Same. * libsupc++/vterminate.cc: Same. * testsuite/ext/hash_map/1.cc: Explicitly qualify __gnu_cxx::hash_map. * testsuite/ext/hash_map/14648.cc: Same. * libsupc++/eh_alloc.cc: Correct comment line spacing. From-SVN: r108775
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