
2010-06-03 Paolo Carlini <paolo.carlini@oracle.com> * include/bits/c++config (std::size_t, std::ptrdiff_t, std::nullptr_t): Provide typedefs. * include/c_std/cstddef: Don't provide std::size_t and std::ptrdiff_t here. * include/c_global/cstddef: Likewise. * src/condition_variable.cc: Don't include <cstddef>, don't use NULL, use std::size_t and std::ptrdiff_t. * src/mt_allocator.cc: Likewise. * src/localename.cc: Likewise. * src/chrono.cc: Likewise. * src/thread.cc: Likewise. * include/debug/formatter.h: Likewise. * include/debug/functions.h: Likewise. * include/std/valarray: Likewise. * include/std/thread: Likewise. * include/std/type_traits: Likewise. * include/std/atomic: Likewise. * include/std/iterator: Likewise. * include/std/bitset: Likewise. * include/std/fstream: Likewise. * include/std/mutex: Likewise. * include/c_std/cstdlib: Likewise. * include/c_std/cstdio: Likewise. * include/c_std/ctime: Likewise. * include/c_std/cwchar: Likewise. * include/c_std/cstring: Likewise. * include/parallel/multiway_merge.h: Likewise. * include/parallel/multiseq_selection.h: Likewise. * include/parallel/base.h: Likewise. * include/parallel/basic_iterator.h: Likewise. * include/parallel/multiway_mergesort.h * include/parallel/partition.h: Likewise. * include/ext/string_conversions.h: Likewise. * include/ext/pb_ds/assoc_container.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/ hash_prime_size_policy_imp.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/ sample_resize_policy.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/ sample_resize_trigger.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_store_hash_fn_imps.hpp: Likewise. * include/ext/pb_ds/d: Likewise.etail/cc_hash_table_map_/ insert_no_store_hash_fn_imps.hpp * include/ext/pb_ds/detail/cc_hash_table_map_/ cmp_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ insert_store_hash_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ info_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ entry_list_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ cc_ht_map_.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ resize_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_no_store_hash_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ iterator.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ const_iterator.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ const_point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/ insert_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/ const_child_iterator.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/internal_node.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ r_erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ rotate_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ node_iterators.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ point_iterators.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ gp_ht_map_.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ resize_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ standard_policies.hpp: Likewise. * include/ext/pb_ds/detail/tree_policy/ sample_tree_node_update.hpp: Likewise. * include/ext/pb_ds/detail/basic_tree_policy/ null_node_metadata.hpp: Likewise. * include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp: Likewise. * include/ext/pb_ds/detail/binary_heap_/ const_point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/binary_heap_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/trie_policy/ sample_trie_node_update.hpp: Likewise. * include/ext/pb_ds/detail/trie_policy/ sample_trie_e_access_traits.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_policy/ counter_lu_metadata.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ null_metadata.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_iterator.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/ sample_ranged_probe_fn.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/ sample_ranged_hash_fn.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ constructor_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ info_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rc_binomial_heap_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rc_binomial_heap_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rc_binomial_heap_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp: Likewise. * include/ext/pb_ds/list_update_policy.hpp: Likewise. * include/ext/pb_ds/exception.hpp: Likewise. * include/ext/pb_ds/tree_policy.hpp: Likewise. * include/ext/pb_ds/tag_and_trait.hpp: Likewise. * include/ext/pb_ds/hash_policy.hpp: Likewise. * include/ext/pb_ds/trie_policy.hpp: Likewise. * include/ext/pb_ds/priority_queue.hpp: Likewise. * include/ext/throw_allocator.h: Likewis: Likewise.e. * include/ext/bitmap_allocator.h * include/ext/rc_string_base.h: Likewise. * include/ext/new_allocator.h: Likewise. * include/ext/codecvt_specializations.h: Likewise. * include/ext/functional: Likewise.: Likewise. * include/ext/array_allocator.h: Likewise. * include/ext/mt_allocator.h: Likewise. * include/ext/sso_string_base.h: Likewise. * include/profile/impl/profiler_trace.h: Likewise. * include/profile/impl/profiler_node.h: Likewise. * include/bits/stl_algobase.h: Likewise. * include/bits/functional_hash.h: Likewise. * include/bits/locale_facets.tcc: Likewise. * include/bits/locale_facets.h: Likewise. * include/bits/stl_iterator_base_types.h: Likewise. * include/bits/move.h: Likewise. * include/bits/boost_concept_check.h: Likewise. * include/bits/basic_string.tcc: Likewise. * include/bits/locale_facets_nonio.tcc: Likewise. * include/bits/fstream.tcc: Likewise. * include/bits/locale_facets_nonio.h: Likewise. * include/c_global/cstdlib: Likewise. * include/c_global/cstdio: Likewise. * include/c_global/ctime: Likewise. * include/c_global/cwchar: Likewise. * include/c_global/cstring * include/tr1/type_traits: Likewise. * include/backward/hash_fun.h: Likewise. * libsupc++/new: Likewise. * libsupc++/initializer_list: Likewise. * testsuite/27_io/basic_ofstream/pthread2.cc: Likewise. * testsuite/27_io/basic_iostream/cons/2020.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetn/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/overflow/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetc/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/char/1057.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sputc/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_streambuf/sputc/char/1057.cc: Likewise. * testsuite/27_io/objects/wchar_t/5268.cc: Likewise. * testsuite/27_io/objects/char/9661-1.cc: Likewise. * testsuite/27_io/objects/char/5268.cc: Likewise. * testsuite/27_io/objects/char/10.cc: Likewise. * testsuite/27_io/basic_ios/copyfmt/char/1.cc: Likewise. * testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise. * testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise. * testsuite/27_io/basic_ios/locales/char/1.cc: Likewise. * testsuite/27_io/basic_ios/clear/char/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/pthread3.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputc/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputc/char/1057.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputn/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputn/char/1057.cc: Likewise. * testsuite/27_io/basic_istream/get/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/get/char/1.cc: Likewise. * testsuite/27_io/basic_istream/ignore/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/ignore/char/1.cc: Likewise. * testsuite/27_io/basic_istream/peek/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/peek/char/1.cc: Likewise. * testsuite/27_io/basic_istream/getline/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/getline/char/1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_other/wchar_t/ exceptions_null.cc * testsuite/27_io/basic_istream/extractors_other/wchar_t/ 1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_other/char/ exceptions_null.cc: Likewise. * testsuite/27_io/basic_istream/extractors_other/char/1.cc: Likewise. * testsuite/27_io/basic_istream/cons/3.cc: Likewise. * testsuite/27_io/basic_istream/extractors_arithmetic/ wchar_t/01.cc: Likewise. * testsuite/27_io/basic_istream/extractors_arithmetic/ char/01.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ wchar_t/2.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ wchar_t/3.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/2.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/3.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/9826.cc: Likewise. * testsuite/27_io/basic_istream/read/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/read/char/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/ exceptions_null.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/ 1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/char/ exceptions_null.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/char/1.cc: Likewise. * testsuite/27_io/basic_ostream/cons/2020.cc: Likewise. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_character/ wchar_t/8.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_character/ char/8.cc: Likewise. * testsuite/27_io/basic_filebuf/setbuf/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/sputc/char/1057.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/2.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/9507.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc: Likewise. * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/9964.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/2.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/12790-3.cc: Likewise. * testsuite/27_io/basic_filebuf/sputn/char/1057.cc: Likewise. * testsuite/24_iterators/ostreambuf_iterator/2.cc: Likewise. * testsuite/18_support/bad_exception/23591_thread-1.c * testsuite/18_support/new_delete_placement.cc: Likewise. * testsuite/18_support/pthread_guard.cc: Likewise. * testsuite/21_strings/basic_string/operations/wchar_t/1.cc: Likewise. * testsuite/21_strings/basic_string/operations/char/1.cc: Likewise. * testsuite/21_strings/basic_string/pthread4.cc: Likewise. * testsuite/21_strings/basic_string/cons/wchar_t/5.cc: Likewise. * testsuite/21_strings/basic_string/cons/char/5.cc: Likewise. * testsuite/30_threads/timed_mutex/cons/assign_neg.cc: Likewise. * testsuite/30_threads/timed_mutex/cons/copy_neg.cc: Likewise. * testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Likewise. * testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Likewise. * testsuite/30_threads/mutex/cons/assign_neg.cc: Likewise. * testsuite/30_threads/mutex/cons/copy_neg.cc: Likewise. * testsuite/30_threads/thread/cons/assign_neg.cc: Likewise. * testsuite/30_threads/thread/cons/copy_neg.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/cons/ assign_neg.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/cons/ copy_neg.cc: Likewise. * testsuite/ext/mt_allocator/22309_thread.cc: Likewise. * testsuite/ext/slist/23781.cc: Likewise. * testsuite/ext/rope/pthread7-rope.cc: Likewise. * testsuite/ext/stdio_filebuf/char/10063-2.cc: Likewise. * testsuite/22_locale/ctype/is/wchar_t/1.cc: Likewise. * testsuite/22_locale/ctype/is/char/1.cc: Likewise. * testsuite/22_locale/time_put/put/char/12439_1.cc: Likewise. * testsuite/22_locale/time_put/put/char/12439_3.cc: Likewise. * testsuite/22_locale/locale/cons/2.cc: Likewise. * testsuite/22_locale/locale/cons/12658_thread-1.cc: Likewise. * testsuite/22_locale/locale/cons/29217.cc: Likewise. * testsuite/22_locale/locale/global_locale_objects/14071.cc: Likewise. * testsuite/22_locale/locale/global_locale_objects/2.cc: Likewise. * testsuite/tr1/6_containers/unordered_multimap/ requirements/iterator_null_neg.cc: Likewise. * testsuite/tr1/6_containers/unordered_multiset/ requirements/iterator_null_neg.cc: Likewise. * testsuite/29_atomics/atomic_address/cons/single_value.cc: Likewise. * testsuite/29_atomics/atomic_address/cons/aggregate.cc: Likewise. * testsuite/23_containers/multimap/23781.cc: Likewise. * testsuite/23_containers/set/23781.cc: Likewise. * testsuite/23_containers/multiset/23781.cc: Likewise. * testsuite/23_containers/list/pthread1.cc: Likewise. * testsuite/23_containers/list/23781.cc: Likewise. * testsuite/23_containers/map/pthread6.cc: Likewise. * testsuite/23_containers/map/23781.cc: Likewise. * testsuite/util/regression/rand/priority_queue/ rand_regression_test.hpp: Likewise. * testsuite/util/regression/rand/priority_queue/ container_rand_regression_test.tcc: Likewise. * testsuite/util/regression/rand/assoc/ rand_regression_test.hpp: Likewise. * testsuite/util/regression/rand/assoc/ container_rand_regression_test.tcc: Likewise. * testsuite/util/testsuite_hooks.cc: Likewise. * testsuite/util/testsuite_io.h: Likewise. * testsuite/util/testsuite_iterators.h: Likewise. * testsuite/util/replacement_memory_operators.h: Likewise. * testsuite/util/testsuite_allocator.h: Likewise. * testsuite/util/testsuite_performance.h: Likewise. From-SVN: r160231
508 lines
16 KiB
C++
508 lines
16 KiB
C++
// Locale support (codecvt) -*- C++ -*-
|
|
|
|
// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
|
// 2008, 2009, 2010
|
|
// Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
//
|
|
// ISO C++ 14882: 22.2.1.5 Template class codecvt
|
|
//
|
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
/** @file ext/codecvt_specializations.h
|
|
* This file is a GNU extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _EXT_CODECVT_SPECIALIZATIONS_H
|
|
#define _EXT_CODECVT_SPECIALIZATIONS_H 1
|
|
|
|
#include <bits/c++config.h>
|
|
#include <locale>
|
|
#include <iconv.h>
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|
|
|
/// Extension to use iconv for dealing with character encodings.
|
|
// This includes conversions and comparisons between various character
|
|
// sets. This object encapsulates data that may need to be shared between
|
|
// char_traits, codecvt and ctype.
|
|
class encoding_state
|
|
{
|
|
public:
|
|
// Types:
|
|
// NB: A conversion descriptor subsumes and enhances the
|
|
// functionality of a simple state type such as mbstate_t.
|
|
typedef iconv_t descriptor_type;
|
|
|
|
protected:
|
|
// Name of internal character set encoding.
|
|
std::string _M_int_enc;
|
|
|
|
// Name of external character set encoding.
|
|
std::string _M_ext_enc;
|
|
|
|
// Conversion descriptor between external encoding to internal encoding.
|
|
descriptor_type _M_in_desc;
|
|
|
|
// Conversion descriptor between internal encoding to external encoding.
|
|
descriptor_type _M_out_desc;
|
|
|
|
// The byte-order marker for the external encoding, if necessary.
|
|
int _M_ext_bom;
|
|
|
|
// The byte-order marker for the internal encoding, if necessary.
|
|
int _M_int_bom;
|
|
|
|
// Number of external bytes needed to construct one complete
|
|
// character in the internal encoding.
|
|
// NB: -1 indicates variable, or stateful, encodings.
|
|
int _M_bytes;
|
|
|
|
public:
|
|
explicit
|
|
encoding_state()
|
|
: _M_in_desc(0), _M_out_desc(0), _M_ext_bom(0), _M_int_bom(0), _M_bytes(0)
|
|
{ }
|
|
|
|
explicit
|
|
encoding_state(const char* __int, const char* __ext,
|
|
int __ibom = 0, int __ebom = 0, int __bytes = 1)
|
|
: _M_int_enc(__int), _M_ext_enc(__ext), _M_in_desc(0), _M_out_desc(0),
|
|
_M_ext_bom(__ebom), _M_int_bom(__ibom), _M_bytes(__bytes)
|
|
{ init(); }
|
|
|
|
// 21.1.2 traits typedefs
|
|
// p4
|
|
// typedef STATE_T state_type
|
|
// requires: state_type shall meet the requirements of
|
|
// CopyConstructible types (20.1.3)
|
|
// NB: This does not preserve the actual state of the conversion
|
|
// descriptor member, but it does duplicate the encoding
|
|
// information.
|
|
encoding_state(const encoding_state& __obj) : _M_in_desc(0), _M_out_desc(0)
|
|
{ construct(__obj); }
|
|
|
|
// Need assignment operator as well.
|
|
encoding_state&
|
|
operator=(const encoding_state& __obj)
|
|
{
|
|
construct(__obj);
|
|
return *this;
|
|
}
|
|
|
|
~encoding_state()
|
|
{ destroy(); }
|
|
|
|
bool
|
|
good() const throw()
|
|
{
|
|
const descriptor_type __err = (iconv_t)(-1);
|
|
bool __test = _M_in_desc && _M_in_desc != __err;
|
|
__test &= _M_out_desc && _M_out_desc != __err;
|
|
return __test;
|
|
}
|
|
|
|
int
|
|
character_ratio() const
|
|
{ return _M_bytes; }
|
|
|
|
const std::string
|
|
internal_encoding() const
|
|
{ return _M_int_enc; }
|
|
|
|
int
|
|
internal_bom() const
|
|
{ return _M_int_bom; }
|
|
|
|
const std::string
|
|
external_encoding() const
|
|
{ return _M_ext_enc; }
|
|
|
|
int
|
|
external_bom() const
|
|
{ return _M_ext_bom; }
|
|
|
|
const descriptor_type&
|
|
in_descriptor() const
|
|
{ return _M_in_desc; }
|
|
|
|
const descriptor_type&
|
|
out_descriptor() const
|
|
{ return _M_out_desc; }
|
|
|
|
protected:
|
|
void
|
|
init()
|
|
{
|
|
const descriptor_type __err = (iconv_t)(-1);
|
|
const bool __have_encodings = _M_int_enc.size() && _M_ext_enc.size();
|
|
if (!_M_in_desc && __have_encodings)
|
|
{
|
|
_M_in_desc = iconv_open(_M_int_enc.c_str(), _M_ext_enc.c_str());
|
|
if (_M_in_desc == __err)
|
|
std::__throw_runtime_error(__N("encoding_state::_M_init "
|
|
"creating iconv input descriptor failed"));
|
|
}
|
|
if (!_M_out_desc && __have_encodings)
|
|
{
|
|
_M_out_desc = iconv_open(_M_ext_enc.c_str(), _M_int_enc.c_str());
|
|
if (_M_out_desc == __err)
|
|
std::__throw_runtime_error(__N("encoding_state::_M_init "
|
|
"creating iconv output descriptor failed"));
|
|
}
|
|
}
|
|
|
|
void
|
|
construct(const encoding_state& __obj)
|
|
{
|
|
destroy();
|
|
_M_int_enc = __obj._M_int_enc;
|
|
_M_ext_enc = __obj._M_ext_enc;
|
|
_M_ext_bom = __obj._M_ext_bom;
|
|
_M_int_bom = __obj._M_int_bom;
|
|
_M_bytes = __obj._M_bytes;
|
|
init();
|
|
}
|
|
|
|
void
|
|
destroy() throw()
|
|
{
|
|
const descriptor_type __err = (iconv_t)(-1);
|
|
if (_M_in_desc && _M_in_desc != __err)
|
|
{
|
|
iconv_close(_M_in_desc);
|
|
_M_in_desc = 0;
|
|
}
|
|
if (_M_out_desc && _M_out_desc != __err)
|
|
{
|
|
iconv_close(_M_out_desc);
|
|
_M_out_desc = 0;
|
|
}
|
|
}
|
|
};
|
|
|
|
/// encoding_char_traits
|
|
// Custom traits type with encoding_state for the state type, and the
|
|
// associated fpos<encoding_state> for the position type, all other
|
|
// bits equivalent to the required char_traits instantiations.
|
|
template<typename _CharT>
|
|
struct encoding_char_traits : public std::char_traits<_CharT>
|
|
{
|
|
typedef encoding_state state_type;
|
|
typedef typename std::fpos<state_type> pos_type;
|
|
};
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(std)
|
|
|
|
using __gnu_cxx::encoding_state;
|
|
|
|
/// codecvt<InternT, _ExternT, encoding_state> specialization.
|
|
// This partial specialization takes advantage of iconv to provide
|
|
// code conversions between a large number of character encodings.
|
|
template<typename _InternT, typename _ExternT>
|
|
class codecvt<_InternT, _ExternT, encoding_state>
|
|
: public __codecvt_abstract_base<_InternT, _ExternT, encoding_state>
|
|
{
|
|
public:
|
|
// Types:
|
|
typedef codecvt_base::result result;
|
|
typedef _InternT intern_type;
|
|
typedef _ExternT extern_type;
|
|
typedef __gnu_cxx::encoding_state state_type;
|
|
typedef state_type::descriptor_type descriptor_type;
|
|
|
|
// Data Members:
|
|
static locale::id id;
|
|
|
|
explicit
|
|
codecvt(size_t __refs = 0)
|
|
: __codecvt_abstract_base<intern_type, extern_type, state_type>(__refs)
|
|
{ }
|
|
|
|
explicit
|
|
codecvt(state_type& __enc, size_t __refs = 0)
|
|
: __codecvt_abstract_base<intern_type, extern_type, state_type>(__refs)
|
|
{ }
|
|
|
|
protected:
|
|
virtual
|
|
~codecvt() { }
|
|
|
|
virtual result
|
|
do_out(state_type& __state, const intern_type* __from,
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
extern_type* __to, extern_type* __to_end,
|
|
extern_type*& __to_next) const;
|
|
|
|
virtual result
|
|
do_unshift(state_type& __state, extern_type* __to,
|
|
extern_type* __to_end, extern_type*& __to_next) const;
|
|
|
|
virtual result
|
|
do_in(state_type& __state, const extern_type* __from,
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
intern_type* __to, intern_type* __to_end,
|
|
intern_type*& __to_next) const;
|
|
|
|
virtual int
|
|
do_encoding() const throw();
|
|
|
|
virtual bool
|
|
do_always_noconv() const throw();
|
|
|
|
virtual int
|
|
do_length(state_type&, const extern_type* __from,
|
|
const extern_type* __end, size_t __max) const;
|
|
|
|
virtual int
|
|
do_max_length() const throw();
|
|
};
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
locale::id
|
|
codecvt<_InternT, _ExternT, encoding_state>::id;
|
|
|
|
// This adaptor works around the signature problems of the second
|
|
// argument to iconv(): SUSv2 and others use 'const char**', but glibc 2.2
|
|
// uses 'char**', which matches the POSIX 1003.1-2001 standard.
|
|
// Using this adaptor, g++ will do the work for us.
|
|
template<typename _Tp>
|
|
inline size_t
|
|
__iconv_adaptor(size_t(*__func)(iconv_t, _Tp, size_t*, char**, size_t*),
|
|
iconv_t __cd, char** __inbuf, size_t* __inbytes,
|
|
char** __outbuf, size_t* __outbytes)
|
|
{ return __func(__cd, (_Tp)__inbuf, __inbytes, __outbuf, __outbytes); }
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
codecvt_base::result
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
|
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
|
|
{
|
|
result __ret = codecvt_base::error;
|
|
if (__state.good())
|
|
{
|
|
const descriptor_type& __desc = __state.out_descriptor();
|
|
const size_t __fmultiple = sizeof(intern_type);
|
|
size_t __fbytes = __fmultiple * (__from_end - __from);
|
|
const size_t __tmultiple = sizeof(extern_type);
|
|
size_t __tbytes = __tmultiple * (__to_end - __to);
|
|
|
|
// Argument list for iconv specifies a byte sequence. Thus,
|
|
// all to/from arrays must be brutally casted to char*.
|
|
char* __cto = reinterpret_cast<char*>(__to);
|
|
char* __cfrom;
|
|
size_t __conv;
|
|
|
|
// Some encodings need a byte order marker as the first item
|
|
// in the byte stream, to designate endian-ness. The default
|
|
// value for the byte order marker is NULL, so if this is
|
|
// the case, it's not necessary and we can just go on our
|
|
// merry way.
|
|
int __int_bom = __state.internal_bom();
|
|
if (__int_bom)
|
|
{
|
|
size_t __size = __from_end - __from;
|
|
intern_type* __cfixed = static_cast<intern_type*>
|
|
(__builtin_alloca(sizeof(intern_type) * (__size + 1)));
|
|
__cfixed[0] = static_cast<intern_type>(__int_bom);
|
|
char_traits<intern_type>::copy(__cfixed + 1, __from, __size);
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom,
|
|
&__fbytes, &__cto, &__tbytes);
|
|
}
|
|
else
|
|
{
|
|
intern_type* __cfixed = const_cast<intern_type*>(__from);
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom, &__fbytes,
|
|
&__cto, &__tbytes);
|
|
}
|
|
|
|
if (__conv != size_t(-1))
|
|
{
|
|
__from_next = reinterpret_cast<const intern_type*>(__cfrom);
|
|
__to_next = reinterpret_cast<extern_type*>(__cto);
|
|
__ret = codecvt_base::ok;
|
|
}
|
|
else
|
|
{
|
|
if (__fbytes < __fmultiple * (__from_end - __from))
|
|
{
|
|
__from_next = reinterpret_cast<const intern_type*>(__cfrom);
|
|
__to_next = reinterpret_cast<extern_type*>(__cto);
|
|
__ret = codecvt_base::partial;
|
|
}
|
|
else
|
|
__ret = codecvt_base::error;
|
|
}
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
codecvt_base::result
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
|
do_unshift(state_type& __state, extern_type* __to,
|
|
extern_type* __to_end, extern_type*& __to_next) const
|
|
{
|
|
result __ret = codecvt_base::error;
|
|
if (__state.good())
|
|
{
|
|
const descriptor_type& __desc = __state.in_descriptor();
|
|
const size_t __tmultiple = sizeof(intern_type);
|
|
size_t __tlen = __tmultiple * (__to_end - __to);
|
|
|
|
// Argument list for iconv specifies a byte sequence. Thus,
|
|
// all to/from arrays must be brutally casted to char*.
|
|
char* __cto = reinterpret_cast<char*>(__to);
|
|
size_t __conv = __iconv_adaptor(iconv,__desc, 0, 0,
|
|
&__cto, &__tlen);
|
|
|
|
if (__conv != size_t(-1))
|
|
{
|
|
__to_next = reinterpret_cast<extern_type*>(__cto);
|
|
if (__tlen == __tmultiple * (__to_end - __to))
|
|
__ret = codecvt_base::noconv;
|
|
else if (__tlen == 0)
|
|
__ret = codecvt_base::ok;
|
|
else
|
|
__ret = codecvt_base::partial;
|
|
}
|
|
else
|
|
__ret = codecvt_base::error;
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
codecvt_base::result
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
|
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
|
|
{
|
|
result __ret = codecvt_base::error;
|
|
if (__state.good())
|
|
{
|
|
const descriptor_type& __desc = __state.in_descriptor();
|
|
const size_t __fmultiple = sizeof(extern_type);
|
|
size_t __flen = __fmultiple * (__from_end - __from);
|
|
const size_t __tmultiple = sizeof(intern_type);
|
|
size_t __tlen = __tmultiple * (__to_end - __to);
|
|
|
|
// Argument list for iconv specifies a byte sequence. Thus,
|
|
// all to/from arrays must be brutally casted to char*.
|
|
char* __cto = reinterpret_cast<char*>(__to);
|
|
char* __cfrom;
|
|
size_t __conv;
|
|
|
|
// Some encodings need a byte order marker as the first item
|
|
// in the byte stream, to designate endian-ness. The default
|
|
// value for the byte order marker is NULL, so if this is
|
|
// the case, it's not necessary and we can just go on our
|
|
// merry way.
|
|
int __ext_bom = __state.external_bom();
|
|
if (__ext_bom)
|
|
{
|
|
size_t __size = __from_end - __from;
|
|
extern_type* __cfixed = static_cast<extern_type*>
|
|
(__builtin_alloca(sizeof(extern_type) * (__size + 1)));
|
|
__cfixed[0] = static_cast<extern_type>(__ext_bom);
|
|
char_traits<extern_type>::copy(__cfixed + 1, __from, __size);
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom,
|
|
&__flen, &__cto, &__tlen);
|
|
}
|
|
else
|
|
{
|
|
extern_type* __cfixed = const_cast<extern_type*>(__from);
|
|
__cfrom = reinterpret_cast<char*>(__cfixed);
|
|
__conv = __iconv_adaptor(iconv, __desc, &__cfrom,
|
|
&__flen, &__cto, &__tlen);
|
|
}
|
|
|
|
|
|
if (__conv != size_t(-1))
|
|
{
|
|
__from_next = reinterpret_cast<const extern_type*>(__cfrom);
|
|
__to_next = reinterpret_cast<intern_type*>(__cto);
|
|
__ret = codecvt_base::ok;
|
|
}
|
|
else
|
|
{
|
|
if (__flen < static_cast<size_t>(__from_end - __from))
|
|
{
|
|
__from_next = reinterpret_cast<const extern_type*>(__cfrom);
|
|
__to_next = reinterpret_cast<intern_type*>(__cto);
|
|
__ret = codecvt_base::partial;
|
|
}
|
|
else
|
|
__ret = codecvt_base::error;
|
|
}
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
int
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
|
do_encoding() const throw()
|
|
{
|
|
int __ret = 0;
|
|
if (sizeof(_ExternT) <= sizeof(_InternT))
|
|
__ret = sizeof(_InternT) / sizeof(_ExternT);
|
|
return __ret;
|
|
}
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
bool
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
|
do_always_noconv() const throw()
|
|
{ return false; }
|
|
|
|
template<typename _InternT, typename _ExternT>
|
|
int
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
|
do_length(state_type&, const extern_type* __from,
|
|
const extern_type* __end, size_t __max) const
|
|
{ return std::min(__max, static_cast<size_t>(__end - __from)); }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 74. Garbled text for codecvt::do_max_length
|
|
template<typename _InternT, typename _ExternT>
|
|
int
|
|
codecvt<_InternT, _ExternT, encoding_state>::
|
|
do_max_length() const throw()
|
|
{ return 1; }
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
#endif
|