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
606 lines
16 KiB
C++
606 lines
16 KiB
C++
// -*- C++ -*-
|
|
|
|
// Copyright (C) 2005, 2006, 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/>.
|
|
|
|
// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
|
|
|
|
// Permission to use, copy, modify, sell, and distribute this software
|
|
// is hereby granted without fee, provided that the above copyright
|
|
// notice appears in all copies, and that both that copyright notice
|
|
// and this permission notice appear in supporting documentation. None
|
|
// of the above authors, nor IBM Haifa Research Laboratories, make any
|
|
// representation about the suitability of this software for any
|
|
// purpose. It is provided "as is" without express or implied
|
|
// warranty.
|
|
|
|
/**
|
|
* @file hash_policy.hpp
|
|
* Contains hash-related policies.
|
|
*/
|
|
|
|
#ifndef PB_DS_HASH_POLICY_HPP
|
|
#define PB_DS_HASH_POLICY_HPP
|
|
|
|
#include <bits/c++config.h>
|
|
#include <algorithm>
|
|
#include <vector>
|
|
#include <cmath>
|
|
#include <ext/pb_ds/exception.hpp>
|
|
#include <ext/pb_ds/detail/type_utils.hpp>
|
|
#include <ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp>
|
|
#include <ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp>
|
|
#include <ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp>
|
|
|
|
namespace __gnu_pbds
|
|
{
|
|
// A null hash function, indicating that the combining hash function
|
|
// is actually a ranged hash function.
|
|
struct null_hash_fn
|
|
{ };
|
|
|
|
// A null probe function, indicating that the combining probe
|
|
// function is actually a ranged probe function.
|
|
struct null_probe_fn
|
|
{ };
|
|
|
|
#define PB_DS_CLASS_T_DEC template<typename Size_Type>
|
|
#define PB_DS_CLASS_C_DEC linear_probe_fn<Size_Type>
|
|
|
|
// A probe sequence policy using fixed increments.
|
|
template<typename Size_Type = std::size_t>
|
|
class linear_probe_fn
|
|
{
|
|
public:
|
|
typedef Size_Type size_type;
|
|
|
|
void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
protected:
|
|
// Returns the i-th offset from the hash value.
|
|
inline size_type
|
|
operator()(size_type i) const;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC template<typename Size_Type>
|
|
#define PB_DS_CLASS_C_DEC quadratic_probe_fn<Size_Type>
|
|
|
|
// A probe sequence policy using square increments.
|
|
template<typename Size_Type = std::size_t>
|
|
class quadratic_probe_fn
|
|
{
|
|
public:
|
|
typedef Size_Type size_type;
|
|
|
|
void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
protected:
|
|
// Returns the i-th offset from the hash value.
|
|
inline size_type
|
|
operator()(size_type i) const;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC template<typename Size_Type>
|
|
#define PB_DS_CLASS_C_DEC direct_mask_range_hashing<Size_Type>
|
|
|
|
// A mask range-hashing class (uses a bit-mask).
|
|
template<typename Size_Type = std::size_t>
|
|
class direct_mask_range_hashing
|
|
: public detail::mask_based_range_hashing<Size_Type>
|
|
{
|
|
private:
|
|
typedef detail::mask_based_range_hashing<Size_Type> mask_based_base;
|
|
|
|
public:
|
|
typedef Size_Type size_type;
|
|
|
|
void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
protected:
|
|
void
|
|
notify_resized(size_type size);
|
|
|
|
// Transforms the __hash value hash into a ranged-hash value
|
|
// (using a bit-mask).
|
|
inline size_type
|
|
operator()(size_type hash) const;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC template<typename Size_Type>
|
|
#define PB_DS_CLASS_C_DEC direct_mod_range_hashing<Size_Type>
|
|
|
|
// A mod range-hashing class (uses the modulo function).
|
|
template<typename Size_Type = std::size_t>
|
|
class direct_mod_range_hashing
|
|
: public detail::mod_based_range_hashing<Size_Type>
|
|
{
|
|
public:
|
|
typedef Size_Type size_type;
|
|
|
|
void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
protected:
|
|
void
|
|
notify_resized(size_type size);
|
|
|
|
// Transforms the __hash value hash into a ranged-hash value
|
|
// (using a modulo operation).
|
|
inline size_type
|
|
operator()(size_type hash) const;
|
|
|
|
private:
|
|
typedef detail::mod_based_range_hashing<size_type> mod_based_base;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC template<bool External_Load_Access, typename Size_Type>
|
|
#define PB_DS_CLASS_C_DEC hash_load_check_resize_trigger<External_Load_Access, Size_Type>
|
|
#define PB_DS_SIZE_BASE_C_DEC detail::hash_load_check_resize_trigger_size_base<Size_Type, External_Load_Access>
|
|
|
|
// A resize trigger policy based on a load check. It keeps the
|
|
// load factor between some load factors load_min and load_max.
|
|
template<bool External_Load_Access = false, typename Size_Type = std::size_t>
|
|
class hash_load_check_resize_trigger : private PB_DS_SIZE_BASE_C_DEC
|
|
{
|
|
public:
|
|
typedef Size_Type size_type;
|
|
|
|
enum
|
|
{
|
|
external_load_access = External_Load_Access
|
|
};
|
|
|
|
// Default constructor, or constructor taking load_min and
|
|
// load_max load factors between which this policy will keep the
|
|
// actual load.
|
|
hash_load_check_resize_trigger(float load_min = 0.125,
|
|
float load_max = 0.5);
|
|
|
|
void
|
|
swap(hash_load_check_resize_trigger& other);
|
|
|
|
virtual
|
|
~hash_load_check_resize_trigger();
|
|
|
|
// Returns a pair of the minimal and maximal loads, respectively.
|
|
inline std::pair<float, float>
|
|
get_loads() const;
|
|
|
|
// Sets the loads through a pair of the minimal and maximal
|
|
// loads, respectively.
|
|
void
|
|
set_loads(std::pair<float, float> load_pair);
|
|
|
|
protected:
|
|
inline void
|
|
notify_insert_search_start();
|
|
|
|
inline void
|
|
notify_insert_search_collision();
|
|
|
|
inline void
|
|
notify_insert_search_end();
|
|
|
|
inline void
|
|
notify_find_search_start();
|
|
|
|
inline void
|
|
notify_find_search_collision();
|
|
|
|
inline void
|
|
notify_find_search_end();
|
|
|
|
inline void
|
|
notify_erase_search_start();
|
|
|
|
inline void
|
|
notify_erase_search_collision();
|
|
|
|
inline void
|
|
notify_erase_search_end();
|
|
|
|
// Notifies an element was inserted. The total number of entries
|
|
// in the table is num_entries.
|
|
inline void
|
|
notify_inserted(size_type num_entries);
|
|
|
|
inline void
|
|
notify_erased(size_type num_entries);
|
|
|
|
// Notifies the table was cleared.
|
|
void
|
|
notify_cleared();
|
|
|
|
// Notifies the table was resized as a result of this object's
|
|
// signifying that a resize is needed.
|
|
void
|
|
notify_resized(size_type new_size);
|
|
|
|
void
|
|
notify_externally_resized(size_type new_size);
|
|
|
|
inline bool
|
|
is_resize_needed() const;
|
|
|
|
inline bool
|
|
is_grow_needed(size_type size, size_type num_entries) const;
|
|
|
|
private:
|
|
virtual void
|
|
do_resize(size_type new_size);
|
|
|
|
typedef PB_DS_SIZE_BASE_C_DEC size_base;
|
|
|
|
#ifdef _GLIBCXX_DEBUG
|
|
void
|
|
assert_valid() const;
|
|
#endif
|
|
|
|
float m_load_min;
|
|
float m_load_max;
|
|
size_type m_next_shrink_size;
|
|
size_type m_next_grow_size;
|
|
bool m_resize_needed;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
#undef PB_DS_SIZE_BASE_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC template<bool External_Load_Access, typename Size_Type>
|
|
#define PB_DS_CLASS_C_DEC cc_hash_max_collision_check_resize_trigger<External_Load_Access, Size_Type>
|
|
|
|
// A resize trigger policy based on collision checks. It keeps the
|
|
// simulated load factor lower than some given load factor.
|
|
template<bool External_Load_Access = false, typename Size_Type = std::size_t>
|
|
class cc_hash_max_collision_check_resize_trigger
|
|
{
|
|
public:
|
|
typedef Size_Type size_type;
|
|
|
|
enum
|
|
{
|
|
external_load_access = External_Load_Access
|
|
};
|
|
|
|
// Default constructor, or constructor taking load, a __load
|
|
// factor which it will attempt to maintain.
|
|
cc_hash_max_collision_check_resize_trigger(float load = 0.5);
|
|
|
|
void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
// Returns the current load.
|
|
inline float
|
|
get_load() const;
|
|
|
|
// Sets the load; does not resize the container.
|
|
void
|
|
set_load(float load);
|
|
|
|
protected:
|
|
inline void
|
|
notify_insert_search_start();
|
|
|
|
inline void
|
|
notify_insert_search_collision();
|
|
|
|
inline void
|
|
notify_insert_search_end();
|
|
|
|
inline void
|
|
notify_find_search_start();
|
|
|
|
inline void
|
|
notify_find_search_collision();
|
|
|
|
inline void
|
|
notify_find_search_end();
|
|
|
|
inline void
|
|
notify_erase_search_start();
|
|
|
|
inline void
|
|
notify_erase_search_collision();
|
|
|
|
inline void
|
|
notify_erase_search_end();
|
|
|
|
inline void
|
|
notify_inserted(size_type num_entries);
|
|
|
|
inline void
|
|
notify_erased(size_type num_entries);
|
|
|
|
void
|
|
notify_cleared();
|
|
|
|
// Notifies the table was resized as a result of this object's
|
|
// signifying that a resize is needed.
|
|
void
|
|
notify_resized(size_type new_size);
|
|
|
|
void
|
|
notify_externally_resized(size_type new_size);
|
|
|
|
inline bool
|
|
is_resize_needed() const;
|
|
|
|
inline bool
|
|
is_grow_needed(size_type size, size_type num_entries) const;
|
|
|
|
private:
|
|
void
|
|
calc_max_num_coll();
|
|
|
|
inline void
|
|
calc_resize_needed();
|
|
|
|
float m_load;
|
|
size_type m_size;
|
|
size_type m_num_col;
|
|
size_type m_max_col;
|
|
bool m_resize_needed;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC template<typename Size_Type>
|
|
#define PB_DS_CLASS_C_DEC hash_exponential_size_policy<Size_Type>
|
|
|
|
// A size policy whose sequence of sizes form an exponential
|
|
// sequence (typically powers of 2.
|
|
template<typename Size_Type = std::size_t>
|
|
class hash_exponential_size_policy
|
|
{
|
|
public:
|
|
typedef Size_Type size_type;
|
|
|
|
// Default constructor, or onstructor taking a start_size, or
|
|
// constructor taking a start size and grow_factor. The policy
|
|
// will use the sequence of sizes start_size, start_size*
|
|
// grow_factor, start_size* grow_factor^2, ...
|
|
hash_exponential_size_policy(size_type start_size = 8,
|
|
size_type grow_factor = 2);
|
|
|
|
void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
protected:
|
|
size_type
|
|
get_nearest_larger_size(size_type size) const;
|
|
|
|
size_type
|
|
get_nearest_smaller_size(size_type size) const;
|
|
|
|
private:
|
|
size_type m_start_size;
|
|
size_type m_grow_factor;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC
|
|
#define PB_DS_CLASS_C_DEC hash_prime_size_policy
|
|
|
|
// A size policy whose sequence of sizes form a nearly-exponential
|
|
// sequence of primes.
|
|
class hash_prime_size_policy
|
|
{
|
|
public:
|
|
// Size type.
|
|
typedef std::size_t size_type;
|
|
|
|
// Default constructor, or onstructor taking a start_size The
|
|
// policy will use the sequence of sizes approximately
|
|
// start_size, start_size* 2, start_size* 2^2, ...
|
|
hash_prime_size_policy(size_type start_size = 8);
|
|
|
|
inline void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
protected:
|
|
size_type
|
|
get_nearest_larger_size(size_type size) const;
|
|
|
|
size_type
|
|
get_nearest_smaller_size(size_type size) const;
|
|
|
|
private:
|
|
size_type m_start_size;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
#define PB_DS_CLASS_T_DEC template<typename Size_Policy, typename Trigger_Policy, bool External_Size_Access, typename Size_Type>
|
|
|
|
#define PB_DS_CLASS_C_DEC hash_standard_resize_policy<Size_Policy, Trigger_Policy, External_Size_Access, Size_Type>
|
|
|
|
// A resize policy which delegates operations to size and trigger policies.
|
|
template<typename Size_Policy = hash_exponential_size_policy<>,
|
|
typename Trigger_Policy = hash_load_check_resize_trigger<>,
|
|
bool External_Size_Access = false,
|
|
typename Size_Type = std::size_t>
|
|
class hash_standard_resize_policy
|
|
: public Size_Policy, public Trigger_Policy
|
|
{
|
|
public:
|
|
typedef Size_Type size_type;
|
|
typedef Trigger_Policy trigger_policy;
|
|
typedef Size_Policy size_policy;
|
|
|
|
enum
|
|
{
|
|
external_size_access = External_Size_Access
|
|
};
|
|
|
|
// Default constructor.
|
|
hash_standard_resize_policy();
|
|
|
|
// constructor taking some policies r_size_policy will be copied
|
|
// by the Size_Policy object of this object.
|
|
hash_standard_resize_policy(const Size_Policy& r_size_policy);
|
|
|
|
// constructor taking some policies. r_size_policy will be
|
|
// copied by the Size_Policy object of this
|
|
// object. r_trigger_policy will be copied by the Trigger_Policy
|
|
// object of this object.
|
|
hash_standard_resize_policy(const Size_Policy& r_size_policy,
|
|
const Trigger_Policy& r_trigger_policy);
|
|
|
|
virtual
|
|
~hash_standard_resize_policy();
|
|
|
|
inline void
|
|
swap(PB_DS_CLASS_C_DEC& other);
|
|
|
|
// Access to the Size_Policy object used.
|
|
Size_Policy&
|
|
get_size_policy();
|
|
|
|
// Const access to the Size_Policy object used.
|
|
const Size_Policy&
|
|
get_size_policy() const;
|
|
|
|
// Access to the Trigger_Policy object used.
|
|
Trigger_Policy&
|
|
get_trigger_policy();
|
|
|
|
// Access to the Trigger_Policy object used.
|
|
const Trigger_Policy&
|
|
get_trigger_policy() const;
|
|
|
|
// Returns the actual size of the container.
|
|
inline size_type
|
|
get_actual_size() const;
|
|
|
|
// Resizes the container to suggested_new_size, a suggested size
|
|
// (the actual size will be determined by the Size_Policy
|
|
// object).
|
|
void
|
|
resize(size_type suggested_new_size);
|
|
|
|
protected:
|
|
inline void
|
|
notify_insert_search_start();
|
|
|
|
inline void
|
|
notify_insert_search_collision();
|
|
|
|
inline void
|
|
notify_insert_search_end();
|
|
|
|
inline void
|
|
notify_find_search_start();
|
|
|
|
inline void
|
|
notify_find_search_collision();
|
|
|
|
inline void
|
|
notify_find_search_end();
|
|
|
|
inline void
|
|
notify_erase_search_start();
|
|
|
|
inline void
|
|
notify_erase_search_collision();
|
|
|
|
inline void
|
|
notify_erase_search_end();
|
|
|
|
inline void
|
|
notify_inserted(size_type num_e);
|
|
|
|
inline void
|
|
notify_erased(size_type num_e);
|
|
|
|
void
|
|
notify_cleared();
|
|
|
|
void
|
|
notify_resized(size_type new_size);
|
|
|
|
inline bool
|
|
is_resize_needed() const;
|
|
|
|
// Queries what the new size should be, when the container is
|
|
// resized naturally. The current __size of the container is
|
|
// size, and the number of used entries within the container is
|
|
// num_used_e.
|
|
size_type
|
|
get_new_size(size_type size, size_type num_used_e) const;
|
|
|
|
private:
|
|
// Resizes to new_size.
|
|
virtual void
|
|
do_resize(size_type new_size);
|
|
|
|
typedef Trigger_Policy trigger_policy_base;
|
|
|
|
typedef Size_Policy size_policy_base;
|
|
|
|
size_type m_size;
|
|
};
|
|
|
|
#include <ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp>
|
|
|
|
#undef PB_DS_CLASS_T_DEC
|
|
#undef PB_DS_CLASS_C_DEC
|
|
|
|
} // namespace __gnu_pbds
|
|
|
|
#endif
|