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
427 lines
12 KiB
C++
427 lines
12 KiB
C++
// -*- C++ -*-
|
|
|
|
// Copyright (C) 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/>.
|
|
|
|
/** @file parallel/base.h
|
|
* @brief Sequential helper functions.
|
|
* This file is a GNU parallel extension to the Standard C++ Library.
|
|
*/
|
|
|
|
// Written by Johannes Singler.
|
|
|
|
#ifndef _GLIBCXX_PARALLEL_BASE_H
|
|
#define _GLIBCXX_PARALLEL_BASE_H 1
|
|
|
|
#include <bits/c++config.h>
|
|
#include <bits/stl_function.h>
|
|
#include <omp.h>
|
|
#include <parallel/features.h>
|
|
#include <parallel/basic_iterator.h>
|
|
#include <parallel/parallel.h>
|
|
|
|
// Parallel mode namespaces.
|
|
|
|
/**
|
|
* @namespace std::__parallel
|
|
* @brief GNU parallel code, replaces standard behavior with parallel behavior.
|
|
*/
|
|
namespace std
|
|
{
|
|
namespace __parallel { }
|
|
}
|
|
|
|
/**
|
|
* @namespace __gnu_parallel
|
|
* @brief GNU parallel code for public use.
|
|
*/
|
|
namespace __gnu_parallel
|
|
{
|
|
// Import all the parallel versions of components in namespace std.
|
|
using namespace std::__parallel;
|
|
}
|
|
|
|
/**
|
|
* @namespace __gnu_sequential
|
|
* @brief GNU sequential classes for public use.
|
|
*/
|
|
namespace __gnu_sequential
|
|
{
|
|
// Import whatever is the serial version.
|
|
#ifdef _GLIBCXX_PARALLEL
|
|
using namespace std::__norm;
|
|
#else
|
|
using namespace std;
|
|
#endif
|
|
}
|
|
|
|
|
|
namespace __gnu_parallel
|
|
{
|
|
// NB: Including this file cannot produce (unresolved) symbols from
|
|
// the OpenMP runtime unless the parallel mode is actually invoked
|
|
// and active, which imples that the OpenMP runtime is actually
|
|
// going to be linked in.
|
|
inline _ThreadIndex
|
|
__get_max_threads()
|
|
{
|
|
_ThreadIndex __i = omp_get_max_threads();
|
|
return __i > 1 ? __i : 1;
|
|
}
|
|
|
|
|
|
inline bool
|
|
__is_parallel(const _Parallelism __p) { return __p != sequential; }
|
|
|
|
|
|
/** @brief Calculates the rounded-down logarithm of @c __n for base 2.
|
|
* @param __n Argument.
|
|
* @return Returns 0 for any argument <1.
|
|
*/
|
|
template<typename _Size>
|
|
inline _Size
|
|
__rd_log2(_Size __n)
|
|
{
|
|
_Size __k;
|
|
for (__k = 0; __n > 1; __n >>= 1)
|
|
++__k;
|
|
return __k;
|
|
}
|
|
|
|
/** @brief Encode two integers into one gnu_parallel::_CASable.
|
|
* @param __a First integer, to be encoded in the most-significant @c
|
|
* _CASable_bits/2 bits.
|
|
* @param __b Second integer, to be encoded in the least-significant
|
|
* @c _CASable_bits/2 bits.
|
|
* @return value encoding @c __a and @c __b.
|
|
* @see __decode2
|
|
*/
|
|
inline _CASable
|
|
__encode2(int __a, int __b) //must all be non-negative, actually
|
|
{
|
|
return (((_CASable)__a) << (_CASable_bits / 2)) | (((_CASable)__b) << 0);
|
|
}
|
|
|
|
/** @brief Decode two integers from one gnu_parallel::_CASable.
|
|
* @param __x __gnu_parallel::_CASable to decode integers from.
|
|
* @param __a First integer, to be decoded from the most-significant
|
|
* @c _CASable_bits/2 bits of @c __x.
|
|
* @param __b Second integer, to be encoded in the least-significant
|
|
* @c _CASable_bits/2 bits of @c __x.
|
|
* @see __encode2
|
|
*/
|
|
inline void
|
|
__decode2(_CASable __x, int& __a, int& __b)
|
|
{
|
|
__a = (int)((__x >> (_CASable_bits / 2)) & _CASable_mask);
|
|
__b = (int)((__x >> 0 ) & _CASable_mask);
|
|
}
|
|
|
|
//needed for parallel "numeric", even if "algorithm" not included
|
|
|
|
/** @brief Equivalent to std::min. */
|
|
template<typename _Tp>
|
|
const _Tp&
|
|
min(const _Tp& __a, const _Tp& __b)
|
|
{ return (__a < __b) ? __a : __b; }
|
|
|
|
/** @brief Equivalent to std::max. */
|
|
template<typename _Tp>
|
|
const _Tp&
|
|
max(const _Tp& __a, const _Tp& __b)
|
|
{ return (__a > __b) ? __a : __b; }
|
|
|
|
/** @brief Constructs predicate for equality from strict weak
|
|
* ordering predicate
|
|
*/
|
|
template<typename _T1, typename _T2, typename _Compare>
|
|
class _EqualFromLess : public std::binary_function<_T1, _T2, bool>
|
|
{
|
|
private:
|
|
_Compare& _M_comp;
|
|
|
|
public:
|
|
_EqualFromLess(_Compare& __comp) : _M_comp(__comp) { }
|
|
|
|
bool operator()(const _T1& __a, const _T2& __b)
|
|
{ return !_M_comp(__a, __b) && !_M_comp(__b, __a); }
|
|
};
|
|
|
|
|
|
/** @brief Similar to std::unary_negate,
|
|
* but giving the argument types explicitly. */
|
|
template<typename _Predicate, typename argument_type>
|
|
class __unary_negate
|
|
: public std::unary_function<argument_type, bool>
|
|
{
|
|
protected:
|
|
_Predicate _M_pred;
|
|
|
|
public:
|
|
explicit
|
|
__unary_negate(const _Predicate& __x) : _M_pred(__x) { }
|
|
|
|
bool
|
|
operator()(const argument_type& __x)
|
|
{ return !_M_pred(__x); }
|
|
};
|
|
|
|
/** @brief Similar to std::binder1st,
|
|
* but giving the argument types explicitly. */
|
|
template<typename _Operation, typename _FirstArgumentType,
|
|
typename _SecondArgumentType, typename _ResultType>
|
|
class __binder1st
|
|
: public std::unary_function<_SecondArgumentType, _ResultType>
|
|
{
|
|
protected:
|
|
_Operation _M_op;
|
|
_FirstArgumentType _M_value;
|
|
|
|
public:
|
|
__binder1st(const _Operation& __x, const _FirstArgumentType& __y)
|
|
: _M_op(__x), _M_value(__y) { }
|
|
|
|
_ResultType
|
|
operator()(const _SecondArgumentType& __x)
|
|
{ return _M_op(_M_value, __x); }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 109. Missing binders for non-const sequence elements
|
|
_ResultType
|
|
operator()(_SecondArgumentType& __x) const
|
|
{ return _M_op(_M_value, __x); }
|
|
};
|
|
|
|
/**
|
|
* @brief Similar to std::binder2nd, but giving the argument types
|
|
* explicitly.
|
|
*/
|
|
template<typename _Operation, typename _FirstArgumentType,
|
|
typename _SecondArgumentType, typename _ResultType>
|
|
class __binder2nd
|
|
: public std::unary_function<_FirstArgumentType, _ResultType>
|
|
{
|
|
protected:
|
|
_Operation _M_op;
|
|
_SecondArgumentType _M_value;
|
|
|
|
public:
|
|
__binder2nd(const _Operation& __x, const _SecondArgumentType& __y)
|
|
: _M_op(__x), _M_value(__y) { }
|
|
|
|
_ResultType
|
|
operator()(const _FirstArgumentType& __x) const
|
|
{ return _M_op(__x, _M_value); }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 109. Missing binders for non-const sequence elements
|
|
_ResultType
|
|
operator()(_FirstArgumentType& __x)
|
|
{ return _M_op(__x, _M_value); }
|
|
};
|
|
|
|
/** @brief Similar to std::equal_to, but allows two different types. */
|
|
template<typename _T1, typename _T2>
|
|
struct _EqualTo : std::binary_function<_T1, _T2, bool>
|
|
{
|
|
bool operator()(const _T1& __t1, const _T2& __t2) const
|
|
{ return __t1 == __t2; }
|
|
};
|
|
|
|
/** @brief Similar to std::less, but allows two different types. */
|
|
template<typename _T1, typename _T2>
|
|
struct _Less : std::binary_function<_T1, _T2, bool>
|
|
{
|
|
bool
|
|
operator()(const _T1& __t1, const _T2& __t2) const
|
|
{ return __t1 < __t2; }
|
|
|
|
bool
|
|
operator()(const _T2& __t2, const _T1& __t1) const
|
|
{ return __t2 < __t1; }
|
|
};
|
|
|
|
// Partial specialization for one type. Same as std::less.
|
|
template<typename _Tp>
|
|
struct _Less<_Tp, _Tp>
|
|
: public std::less<_Tp> { };
|
|
|
|
/** @brief Similar to std::plus, but allows two different types. */
|
|
template<typename _Tp1, typename _Tp2, typename _Result
|
|
= __typeof__(*static_cast<_Tp1*>(0)
|
|
+ *static_cast<_Tp2*>(0))>
|
|
struct _Plus : public std::binary_function<_Tp1, _Tp2, _Result>
|
|
{
|
|
_Result
|
|
operator()(const _Tp1& __x, const _Tp2& __y) const
|
|
{ return __x + __y; }
|
|
};
|
|
|
|
// Partial specialization for one type. Same as std::plus.
|
|
template<typename _Tp>
|
|
struct _Plus<_Tp, _Tp, _Tp>
|
|
: public std::plus<_Tp> { };
|
|
|
|
/** @brief Similar to std::multiplies, but allows two different types. */
|
|
template<typename _Tp1, typename _Tp2, typename _Result
|
|
= __typeof__(*static_cast<_Tp1*>(0)
|
|
* *static_cast<_Tp2*>(0))>
|
|
struct _Multiplies : public std::binary_function<_Tp1, _Tp2, _Result>
|
|
{
|
|
_Result
|
|
operator()(const _Tp1& __x, const _Tp2& __y) const
|
|
{ return __x * __y; }
|
|
};
|
|
|
|
// Partial specialization for one type. Same as std::multiplies.
|
|
template<typename _Tp>
|
|
struct _Multiplies<_Tp, _Tp, _Tp>
|
|
: public std::multiplies<_Tp> { };
|
|
|
|
/** @brief _Iterator associated with __gnu_parallel::_PseudoSequence.
|
|
* If features the usual random-access iterator functionality.
|
|
* @param _Tp Sequence _M_value type.
|
|
* @param _DifferenceType Sequence difference type.
|
|
*/
|
|
template<typename _Tp, typename _DifferenceTp>
|
|
class _PseudoSequenceIterator
|
|
{
|
|
public:
|
|
typedef _DifferenceTp _DifferenceType;
|
|
|
|
_PseudoSequenceIterator(const _Tp& __val, _DifferenceType __pos)
|
|
: _M_val(__val), _M_pos(__pos) { }
|
|
|
|
// Pre-increment operator.
|
|
_PseudoSequenceIterator&
|
|
operator++()
|
|
{
|
|
++_M_pos;
|
|
return *this;
|
|
}
|
|
|
|
// Post-increment operator.
|
|
_PseudoSequenceIterator
|
|
operator++(int)
|
|
{ return _PseudoSequenceIterator(_M_pos++); }
|
|
|
|
const _Tp&
|
|
operator*() const
|
|
{ return _M_val; }
|
|
|
|
const _Tp&
|
|
operator[](_DifferenceType) const
|
|
{ return _M_val; }
|
|
|
|
bool
|
|
operator==(const _PseudoSequenceIterator& __i2)
|
|
{ return _M_pos == __i2._M_pos; }
|
|
|
|
bool
|
|
operator!=(const _PseudoSequenceIterator& __i2)
|
|
{ return _M_pos != __i2._M_pos; }
|
|
|
|
_DifferenceType
|
|
operator-(const _PseudoSequenceIterator& __i2)
|
|
{ return _M_pos - __i2._M_pos; }
|
|
|
|
private:
|
|
const _Tp& _M_val;
|
|
_DifferenceType _M_pos;
|
|
};
|
|
|
|
/** @brief Sequence that conceptually consists of multiple copies of
|
|
the same element.
|
|
* The copies are not stored explicitly, of course.
|
|
* @param _Tp Sequence _M_value type.
|
|
* @param _DifferenceType Sequence difference type.
|
|
*/
|
|
template<typename _Tp, typename _DifferenceTp>
|
|
class _PseudoSequence
|
|
{
|
|
public:
|
|
typedef _DifferenceTp _DifferenceType;
|
|
|
|
// Better cast down to uint64_t, than up to _DifferenceTp.
|
|
typedef _PseudoSequenceIterator<_Tp, uint64_t> iterator;
|
|
|
|
/** @brief Constructor.
|
|
* @param _M_val Element of the sequence.
|
|
* @param __count Number of (virtual) copies.
|
|
*/
|
|
_PseudoSequence(const _Tp& __val, _DifferenceType __count)
|
|
: _M_val(__val), _M_count(__count) { }
|
|
|
|
/** @brief Begin iterator. */
|
|
iterator
|
|
begin() const
|
|
{ return iterator(_M_val, 0); }
|
|
|
|
/** @brief End iterator. */
|
|
iterator
|
|
end() const
|
|
{ return iterator(_M_val, _M_count); }
|
|
|
|
private:
|
|
const _Tp& _M_val;
|
|
_DifferenceType _M_count;
|
|
};
|
|
|
|
/** @brief Compute the median of three referenced elements,
|
|
according to @c __comp.
|
|
* @param __a First iterator.
|
|
* @param __b Second iterator.
|
|
* @param __c Third iterator.
|
|
* @param __comp Comparator.
|
|
*/
|
|
template<typename _RAIter, typename _Compare>
|
|
_RAIter
|
|
__median_of_three_iterators(_RAIter __a, _RAIter __b,
|
|
_RAIter __c, _Compare __comp)
|
|
{
|
|
if (__comp(*__a, *__b))
|
|
if (__comp(*__b, *__c))
|
|
return __b;
|
|
else
|
|
if (__comp(*__a, *__c))
|
|
return __c;
|
|
else
|
|
return __a;
|
|
else
|
|
{
|
|
// Just swap __a and __b.
|
|
if (__comp(*__a, *__c))
|
|
return __a;
|
|
else
|
|
if (__comp(*__b, *__c))
|
|
return __c;
|
|
else
|
|
return __b;
|
|
}
|
|
}
|
|
|
|
#define _GLIBCXX_PARALLEL_ASSERT(_Condition) __glibcxx_assert(_Condition)
|
|
|
|
} //namespace __gnu_parallel
|
|
|
|
#endif /* _GLIBCXX_PARALLEL_BASE_H */
|