8fc810787b
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
573 lines
16 KiB
C++
573 lines
16 KiB
C++
// Short-string-optimized versatile string base -*- C++ -*-
|
|
|
|
// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file ext/sso_string_base.h
|
|
* This file is a GNU extension to the Standard C++ Library.
|
|
* This is an internal header file, included by other library headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
#ifndef _SSO_STRING_BASE_H
|
|
#define _SSO_STRING_BASE_H 1
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
class __sso_string_base
|
|
: protected __vstring_utility<_CharT, _Traits, _Alloc>
|
|
{
|
|
public:
|
|
typedef _Traits traits_type;
|
|
typedef typename _Traits::char_type value_type;
|
|
|
|
typedef __vstring_utility<_CharT, _Traits, _Alloc> _Util_Base;
|
|
typedef typename _Util_Base::_CharT_alloc_type _CharT_alloc_type;
|
|
typedef typename _CharT_alloc_type::size_type size_type;
|
|
|
|
private:
|
|
// Data Members:
|
|
typename _Util_Base::template _Alloc_hider<_CharT_alloc_type>
|
|
_M_dataplus;
|
|
size_type _M_string_length;
|
|
|
|
enum { _S_local_capacity = 15 };
|
|
|
|
union
|
|
{
|
|
_CharT _M_local_data[_S_local_capacity + 1];
|
|
size_type _M_allocated_capacity;
|
|
};
|
|
|
|
void
|
|
_M_data(_CharT* __p)
|
|
{ _M_dataplus._M_p = __p; }
|
|
|
|
void
|
|
_M_length(size_type __length)
|
|
{ _M_string_length = __length; }
|
|
|
|
void
|
|
_M_capacity(size_type __capacity)
|
|
{ _M_allocated_capacity = __capacity; }
|
|
|
|
bool
|
|
_M_is_local() const
|
|
{ return _M_data() == _M_local_data; }
|
|
|
|
// Create & Destroy
|
|
_CharT*
|
|
_M_create(size_type&, size_type);
|
|
|
|
void
|
|
_M_dispose()
|
|
{
|
|
if (!_M_is_local())
|
|
_M_destroy(_M_allocated_capacity);
|
|
}
|
|
|
|
void
|
|
_M_destroy(size_type __size) throw()
|
|
{ _M_get_allocator().deallocate(_M_data(), __size + 1); }
|
|
|
|
// _M_construct_aux is used to implement the 21.3.1 para 15 which
|
|
// requires special behaviour if _InIterator is an integral type
|
|
template<typename _InIterator>
|
|
void
|
|
_M_construct_aux(_InIterator __beg, _InIterator __end,
|
|
std::__false_type)
|
|
{
|
|
typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
|
|
_M_construct(__beg, __end, _Tag());
|
|
}
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 438. Ambiguity in the "do the right thing" clause
|
|
template<typename _Integer>
|
|
void
|
|
_M_construct_aux(_Integer __beg, _Integer __end, std::__true_type)
|
|
{ _M_construct_aux_2(static_cast<size_type>(__beg), __end); }
|
|
|
|
void
|
|
_M_construct_aux_2(size_type __req, _CharT __c)
|
|
{ _M_construct(__req, __c); }
|
|
|
|
template<typename _InIterator>
|
|
void
|
|
_M_construct(_InIterator __beg, _InIterator __end)
|
|
{
|
|
typedef typename std::__is_integer<_InIterator>::__type _Integral;
|
|
_M_construct_aux(__beg, __end, _Integral());
|
|
}
|
|
|
|
// For Input Iterators, used in istreambuf_iterators, etc.
|
|
template<typename _InIterator>
|
|
void
|
|
_M_construct(_InIterator __beg, _InIterator __end,
|
|
std::input_iterator_tag);
|
|
|
|
// For forward_iterators up to random_access_iterators, used for
|
|
// string::iterator, _CharT*, etc.
|
|
template<typename _FwdIterator>
|
|
void
|
|
_M_construct(_FwdIterator __beg, _FwdIterator __end,
|
|
std::forward_iterator_tag);
|
|
|
|
void
|
|
_M_construct(size_type __req, _CharT __c);
|
|
|
|
public:
|
|
size_type
|
|
_M_max_size() const
|
|
{ return (_M_get_allocator().max_size() - 1) / 2; }
|
|
|
|
_CharT*
|
|
_M_data() const
|
|
{ return _M_dataplus._M_p; }
|
|
|
|
size_type
|
|
_M_length() const
|
|
{ return _M_string_length; }
|
|
|
|
size_type
|
|
_M_capacity() const
|
|
{
|
|
return _M_is_local() ? size_type(_S_local_capacity)
|
|
: _M_allocated_capacity;
|
|
}
|
|
|
|
bool
|
|
_M_is_shared() const
|
|
{ return false; }
|
|
|
|
void
|
|
_M_set_leaked() { }
|
|
|
|
void
|
|
_M_leak() { }
|
|
|
|
void
|
|
_M_set_length(size_type __n)
|
|
{
|
|
_M_length(__n);
|
|
traits_type::assign(_M_data()[__n], _CharT());
|
|
}
|
|
|
|
__sso_string_base()
|
|
: _M_dataplus(_M_local_data)
|
|
{ _M_set_length(0); }
|
|
|
|
__sso_string_base(const _Alloc& __a);
|
|
|
|
__sso_string_base(const __sso_string_base& __rcs);
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
__sso_string_base(__sso_string_base&& __rcs);
|
|
#endif
|
|
|
|
__sso_string_base(size_type __n, _CharT __c, const _Alloc& __a);
|
|
|
|
template<typename _InputIterator>
|
|
__sso_string_base(_InputIterator __beg, _InputIterator __end,
|
|
const _Alloc& __a);
|
|
|
|
~__sso_string_base()
|
|
{ _M_dispose(); }
|
|
|
|
_CharT_alloc_type&
|
|
_M_get_allocator()
|
|
{ return _M_dataplus; }
|
|
|
|
const _CharT_alloc_type&
|
|
_M_get_allocator() const
|
|
{ return _M_dataplus; }
|
|
|
|
void
|
|
_M_swap(__sso_string_base& __rcs);
|
|
|
|
void
|
|
_M_assign(const __sso_string_base& __rcs);
|
|
|
|
void
|
|
_M_reserve(size_type __res);
|
|
|
|
void
|
|
_M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
|
|
size_type __len2);
|
|
|
|
void
|
|
_M_erase(size_type __pos, size_type __n);
|
|
|
|
void
|
|
_M_clear()
|
|
{ _M_set_length(0); }
|
|
|
|
bool
|
|
_M_compare(const __sso_string_base&) const
|
|
{ return false; }
|
|
};
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_swap(__sso_string_base& __rcs)
|
|
{
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 431. Swapping containers with unequal allocators.
|
|
std::__alloc_swap<_CharT_alloc_type>::_S_do_it(_M_get_allocator(),
|
|
__rcs._M_get_allocator());
|
|
|
|
if (_M_is_local())
|
|
if (__rcs._M_is_local())
|
|
{
|
|
if (_M_length() && __rcs._M_length())
|
|
{
|
|
_CharT __tmp_data[_S_local_capacity + 1];
|
|
traits_type::copy(__tmp_data, __rcs._M_local_data,
|
|
_S_local_capacity + 1);
|
|
traits_type::copy(__rcs._M_local_data, _M_local_data,
|
|
_S_local_capacity + 1);
|
|
traits_type::copy(_M_local_data, __tmp_data,
|
|
_S_local_capacity + 1);
|
|
}
|
|
else if (__rcs._M_length())
|
|
{
|
|
traits_type::copy(_M_local_data, __rcs._M_local_data,
|
|
_S_local_capacity + 1);
|
|
_M_length(__rcs._M_length());
|
|
__rcs._M_set_length(0);
|
|
return;
|
|
}
|
|
else if (_M_length())
|
|
{
|
|
traits_type::copy(__rcs._M_local_data, _M_local_data,
|
|
_S_local_capacity + 1);
|
|
__rcs._M_length(_M_length());
|
|
_M_set_length(0);
|
|
return;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
const size_type __tmp_capacity = __rcs._M_allocated_capacity;
|
|
traits_type::copy(__rcs._M_local_data, _M_local_data,
|
|
_S_local_capacity + 1);
|
|
_M_data(__rcs._M_data());
|
|
__rcs._M_data(__rcs._M_local_data);
|
|
_M_capacity(__tmp_capacity);
|
|
}
|
|
else
|
|
{
|
|
const size_type __tmp_capacity = _M_allocated_capacity;
|
|
if (__rcs._M_is_local())
|
|
{
|
|
traits_type::copy(_M_local_data, __rcs._M_local_data,
|
|
_S_local_capacity + 1);
|
|
__rcs._M_data(_M_data());
|
|
_M_data(_M_local_data);
|
|
}
|
|
else
|
|
{
|
|
_CharT* __tmp_ptr = _M_data();
|
|
_M_data(__rcs._M_data());
|
|
__rcs._M_data(__tmp_ptr);
|
|
_M_capacity(__rcs._M_allocated_capacity);
|
|
}
|
|
__rcs._M_capacity(__tmp_capacity);
|
|
}
|
|
|
|
const size_type __tmp_length = _M_length();
|
|
_M_length(__rcs._M_length());
|
|
__rcs._M_length(__tmp_length);
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
_CharT*
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_create(size_type& __capacity, size_type __old_capacity)
|
|
{
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 83. String::npos vs. string::max_size()
|
|
if (__capacity > _M_max_size())
|
|
std::__throw_length_error(__N("__sso_string_base::_M_create"));
|
|
|
|
// The below implements an exponential growth policy, necessary to
|
|
// meet amortized linear time requirements of the library: see
|
|
// http://gcc.gnu.org/ml/libstdc++/2001-07/msg00085.html.
|
|
if (__capacity > __old_capacity && __capacity < 2 * __old_capacity)
|
|
{
|
|
__capacity = 2 * __old_capacity;
|
|
// Never allocate a string bigger than max_size.
|
|
if (__capacity > _M_max_size())
|
|
__capacity = _M_max_size();
|
|
}
|
|
|
|
// NB: Need an array of char_type[__capacity], plus a terminating
|
|
// null char_type() element.
|
|
return _M_get_allocator().allocate(__capacity + 1);
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
__sso_string_base(const _Alloc& __a)
|
|
: _M_dataplus(__a, _M_local_data)
|
|
{ _M_set_length(0); }
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
__sso_string_base(const __sso_string_base& __rcs)
|
|
: _M_dataplus(__rcs._M_get_allocator(), _M_local_data)
|
|
{ _M_construct(__rcs._M_data(), __rcs._M_data() + __rcs._M_length()); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
__sso_string_base(__sso_string_base&& __rcs)
|
|
: _M_dataplus(__rcs._M_get_allocator(), _M_local_data)
|
|
{
|
|
if (__rcs._M_is_local())
|
|
{
|
|
if (__rcs._M_length())
|
|
traits_type::copy(_M_local_data, __rcs._M_local_data,
|
|
_S_local_capacity + 1);
|
|
}
|
|
else
|
|
{
|
|
_M_data(__rcs._M_data());
|
|
_M_capacity(__rcs._M_allocated_capacity);
|
|
}
|
|
|
|
_M_length(__rcs._M_length());
|
|
__rcs._M_length(0);
|
|
__rcs._M_data(__rcs._M_local_data);
|
|
}
|
|
#endif
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
__sso_string_base(size_type __n, _CharT __c, const _Alloc& __a)
|
|
: _M_dataplus(__a, _M_local_data)
|
|
{ _M_construct(__n, __c); }
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
template<typename _InputIterator>
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
__sso_string_base(_InputIterator __beg, _InputIterator __end,
|
|
const _Alloc& __a)
|
|
: _M_dataplus(__a, _M_local_data)
|
|
{ _M_construct(__beg, __end); }
|
|
|
|
// NB: This is the special case for Input Iterators, used in
|
|
// istreambuf_iterators, etc.
|
|
// Input Iterators have a cost structure very different from
|
|
// pointers, calling for a different coding style.
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
template<typename _InIterator>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_construct(_InIterator __beg, _InIterator __end,
|
|
std::input_iterator_tag)
|
|
{
|
|
size_type __len = 0;
|
|
size_type __capacity = size_type(_S_local_capacity);
|
|
|
|
while (__beg != __end && __len < __capacity)
|
|
{
|
|
_M_data()[__len++] = *__beg;
|
|
++__beg;
|
|
}
|
|
|
|
__try
|
|
{
|
|
while (__beg != __end)
|
|
{
|
|
if (__len == __capacity)
|
|
{
|
|
// Allocate more space.
|
|
__capacity = __len + 1;
|
|
_CharT* __another = _M_create(__capacity, __len);
|
|
_S_copy(__another, _M_data(), __len);
|
|
_M_dispose();
|
|
_M_data(__another);
|
|
_M_capacity(__capacity);
|
|
}
|
|
_M_data()[__len++] = *__beg;
|
|
++__beg;
|
|
}
|
|
}
|
|
__catch(...)
|
|
{
|
|
_M_dispose();
|
|
__throw_exception_again;
|
|
}
|
|
|
|
_M_set_length(__len);
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
template<typename _InIterator>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_construct(_InIterator __beg, _InIterator __end,
|
|
std::forward_iterator_tag)
|
|
{
|
|
// NB: Not required, but considered best practice.
|
|
if (__is_null_pointer(__beg) && __beg != __end)
|
|
std::__throw_logic_error(__N("__sso_string_base::"
|
|
"_M_construct null not valid"));
|
|
|
|
size_type __dnew = static_cast<size_type>(std::distance(__beg, __end));
|
|
|
|
if (__dnew > size_type(_S_local_capacity))
|
|
{
|
|
_M_data(_M_create(__dnew, size_type(0)));
|
|
_M_capacity(__dnew);
|
|
}
|
|
|
|
// Check for out_of_range and length_error exceptions.
|
|
__try
|
|
{ _S_copy_chars(_M_data(), __beg, __end); }
|
|
__catch(...)
|
|
{
|
|
_M_dispose();
|
|
__throw_exception_again;
|
|
}
|
|
|
|
_M_set_length(__dnew);
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_construct(size_type __n, _CharT __c)
|
|
{
|
|
if (__n > size_type(_S_local_capacity))
|
|
{
|
|
_M_data(_M_create(__n, size_type(0)));
|
|
_M_capacity(__n);
|
|
}
|
|
|
|
if (__n)
|
|
_S_assign(_M_data(), __n, __c);
|
|
|
|
_M_set_length(__n);
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_assign(const __sso_string_base& __rcs)
|
|
{
|
|
if (this != &__rcs)
|
|
{
|
|
const size_type __rsize = __rcs._M_length();
|
|
const size_type __capacity = _M_capacity();
|
|
|
|
if (__rsize > __capacity)
|
|
{
|
|
size_type __new_capacity = __rsize;
|
|
_CharT* __tmp = _M_create(__new_capacity, __capacity);
|
|
_M_dispose();
|
|
_M_data(__tmp);
|
|
_M_capacity(__new_capacity);
|
|
}
|
|
|
|
if (__rsize)
|
|
_S_copy(_M_data(), __rcs._M_data(), __rsize);
|
|
|
|
_M_set_length(__rsize);
|
|
}
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_reserve(size_type __res)
|
|
{
|
|
// Make sure we don't shrink below the current size.
|
|
if (__res < _M_length())
|
|
__res = _M_length();
|
|
|
|
const size_type __capacity = _M_capacity();
|
|
if (__res != __capacity)
|
|
{
|
|
if (__res > __capacity
|
|
|| __res > size_type(_S_local_capacity))
|
|
{
|
|
_CharT* __tmp = _M_create(__res, __capacity);
|
|
_S_copy(__tmp, _M_data(), _M_length() + 1);
|
|
_M_dispose();
|
|
_M_data(__tmp);
|
|
_M_capacity(__res);
|
|
}
|
|
else if (!_M_is_local())
|
|
{
|
|
_S_copy(_M_local_data, _M_data(), _M_length() + 1);
|
|
_M_destroy(__capacity);
|
|
_M_data(_M_local_data);
|
|
}
|
|
}
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_mutate(size_type __pos, size_type __len1, const _CharT* __s,
|
|
size_type __len2)
|
|
{
|
|
const size_type __how_much = _M_length() - __pos - __len1;
|
|
|
|
size_type __new_capacity = _M_length() + __len2 - __len1;
|
|
_CharT* __r = _M_create(__new_capacity, _M_capacity());
|
|
|
|
if (__pos)
|
|
_S_copy(__r, _M_data(), __pos);
|
|
if (__s && __len2)
|
|
_S_copy(__r + __pos, __s, __len2);
|
|
if (__how_much)
|
|
_S_copy(__r + __pos + __len2,
|
|
_M_data() + __pos + __len1, __how_much);
|
|
|
|
_M_dispose();
|
|
_M_data(__r);
|
|
_M_capacity(__new_capacity);
|
|
}
|
|
|
|
template<typename _CharT, typename _Traits, typename _Alloc>
|
|
void
|
|
__sso_string_base<_CharT, _Traits, _Alloc>::
|
|
_M_erase(size_type __pos, size_type __n)
|
|
{
|
|
const size_type __how_much = _M_length() - __pos - __n;
|
|
|
|
if (__how_much && __n)
|
|
_S_move(_M_data() + __pos, _M_data() + __pos + __n,
|
|
__how_much);
|
|
|
|
_M_set_length(_M_length() - __n);
|
|
}
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
#endif /* _SSO_STRING_BASE_H */
|