From e4bb1925373a5d73f028114a5389220ea0439bab Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 3 Jun 2010 19:15:56 +0000 Subject: [PATCH] 2010-06-03 Paolo Carlini * 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 , 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160231 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 428 +++++++++++++++++++++ libstdc++-v3/include/backward/hash_fun.h | 2 +- libstdc++-v3/include/bits/basic_string.tcc | 4 +- libstdc++-v3/include/bits/boost_concept_check.h | 5 +- libstdc++-v3/include/bits/c++config | 17 +- libstdc++-v3/include/bits/fstream.tcc | 16 +- libstdc++-v3/include/bits/functional_hash.h | 2 +- libstdc++-v3/include/bits/locale_facets.h | 20 +- libstdc++-v3/include/bits/locale_facets.tcc | 4 +- libstdc++-v3/include/bits/locale_facets_nonio.h | 47 +-- libstdc++-v3/include/bits/locale_facets_nonio.tcc | 2 +- libstdc++-v3/include/bits/move.h | 1 - libstdc++-v3/include/bits/stl_algobase.h | 1 - .../include/bits/stl_iterator_base_types.h | 1 - libstdc++-v3/include/c_global/cstddef | 12 - libstdc++-v3/include/c_global/cstdio | 7 +- libstdc++-v3/include/c_global/cstdlib | 1 - libstdc++-v3/include/c_global/cstring | 1 - libstdc++-v3/include/c_global/ctime | 2 +- libstdc++-v3/include/c_global/cwchar | 1 - libstdc++-v3/include/c_std/cstddef | 7 - libstdc++-v3/include/c_std/cstdio | 8 +- libstdc++-v3/include/c_std/cstdlib | 1 - libstdc++-v3/include/c_std/cstring | 1 - libstdc++-v3/include/c_std/ctime | 2 +- libstdc++-v3/include/c_std/cwchar | 1 - libstdc++-v3/include/debug/formatter.h | 20 +- libstdc++-v3/include/debug/functions.h | 3 +- libstdc++-v3/include/ext/array_allocator.h | 6 +- libstdc++-v3/include/ext/bitmap_allocator.h | 3 +- libstdc++-v3/include/ext/codecvt_specializations.h | 7 +- libstdc++-v3/include/ext/functional | 3 +- libstdc++-v3/include/ext/mt_allocator.h | 14 +- libstdc++-v3/include/ext/new_allocator.h | 1 + libstdc++-v3/include/ext/pb_ds/assoc_container.hpp | 1 + .../basic_tree_policy/null_node_metadata.hpp | 4 +- .../constructors_destructor_fn_imps.hpp | 20 +- .../detail/bin_search_tree_/debug_fn_imps.hpp | 32 +- .../detail/bin_search_tree_/erase_fn_imps.hpp | 2 +- .../pb_ds/detail/bin_search_tree_/find_fn_imps.hpp | 12 +- .../detail/bin_search_tree_/insert_fn_imps.hpp | 18 +- .../detail/bin_search_tree_/iterators_fn_imps.hpp | 4 +- .../detail/bin_search_tree_/node_iterators.hpp | 4 +- .../detail/bin_search_tree_/point_iterators.hpp | 22 +- .../detail/bin_search_tree_/r_erase_fn_imps.hpp | 2 +- .../detail/bin_search_tree_/rotate_fn_imps.hpp | 6 +- .../detail/bin_search_tree_/split_join_fn_imps.hpp | 2 +- .../pb_ds/detail/binary_heap_/const_iterator.hpp | 2 +- .../detail/binary_heap_/const_point_iterator.hpp | 6 +- .../detail/binary_heap_/split_join_fn_imps.hpp | 16 +- .../constructors_destructor_fn_imps.hpp | 6 +- .../detail/binomial_heap_base_/debug_fn_imps.hpp | 8 +- .../detail/binomial_heap_base_/erase_fn_imps.hpp | 42 +- .../detail/binomial_heap_base_/find_fn_imps.hpp | 6 +- .../detail/binomial_heap_base_/insert_fn_imps.hpp | 36 +- .../binomial_heap_base_/split_join_fn_imps.hpp | 52 +-- .../pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp | 28 +- .../detail/cc_hash_table_map_/cmp_fn_imps.hpp | 2 +- .../constructor_destructor_fn_imps.hpp | 4 +- .../detail/cc_hash_table_map_/debug_fn_imps.hpp | 2 +- .../cc_hash_table_map_/entry_list_fn_imps.hpp | 2 +- .../detail/cc_hash_table_map_/erase_fn_imps.hpp | 6 +- .../erase_no_store_hash_fn_imps.hpp | 4 +- .../erase_store_hash_fn_imps.hpp | 4 +- .../detail/cc_hash_table_map_/find_fn_imps.hpp | 4 +- .../detail/cc_hash_table_map_/info_fn_imps.hpp | 2 +- .../insert_no_store_hash_fn_imps.hpp | 4 +- .../insert_store_hash_fn_imps.hpp | 4 +- .../detail/cc_hash_table_map_/resize_fn_imps.hpp | 4 +- .../detail/cc_hash_table_map_/trace_fn_imps.hpp | 2 +- .../detail/gp_hash_table_map_/find_fn_imps.hpp | 4 +- .../pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp | 16 +- .../detail/gp_hash_table_map_/resize_fn_imps.hpp | 2 +- .../gp_hash_table_map_/standard_policies.hpp | 4 +- .../ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp | 4 +- .../pb_ds/detail/hash_fn/sample_range_hashing.hpp | 4 +- .../pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp | 4 +- .../detail/hash_fn/sample_ranged_probe_fn.hpp | 6 +- .../const_iterator.hpp | 8 +- .../const_point_iterator.hpp | 6 +- .../constructors_destructor_fn_imps.hpp | 18 +- .../debug_fn_imps.hpp | 18 +- .../erase_fn_imps.hpp | 24 +- .../insert_fn_imps.hpp | 24 +- .../iterators_fn_imps.hpp | 16 +- .../null_metadata.hpp | 6 +- .../trace_fn_imps.hpp | 2 +- .../constructor_destructor_fn_imps.hpp | 10 +- .../detail/list_update_map_/erase_fn_imps.hpp | 14 +- .../pb_ds/detail/list_update_map_/find_fn_imps.hpp | 8 +- .../pb_ds/detail/list_update_map_/info_fn_imps.hpp | 2 +- .../detail/list_update_map_/insert_fn_imps.hpp | 2 +- .../detail/list_update_map_/iterators_fn_imps.hpp | 8 +- .../ext/pb_ds/detail/list_update_map_/lu_map_.hpp | 6 +- .../detail/list_update_map_/trace_fn_imps.hpp | 2 +- .../list_update_policy/counter_lu_metadata.hpp | 4 +- .../constructors_destructor_fn_imps.hpp | 24 +- .../pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp | 4 +- .../pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp | 2 +- .../pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp | 4 +- .../detail/ov_tree_map_/iterators_fn_imps.hpp | 10 +- .../pb_ds/detail/ov_tree_map_/node_iterators.hpp | 14 +- .../pb_ds/detail/pairing_heap_/debug_fn_imps.hpp | 4 +- .../pb_ds/detail/pairing_heap_/erase_fn_imps.hpp | 54 +-- .../pb_ds/detail/pairing_heap_/insert_fn_imps.hpp | 8 +- .../detail/pairing_heap_/split_join_fn_imps.hpp | 16 +- .../ext/pb_ds/detail/pat_trie_/child_iterator.hpp | 4 +- .../detail/pat_trie_/const_child_iterator.hpp | 8 +- .../pat_trie_/constructors_destructor_fn_imps.hpp | 6 +- .../ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp | 6 +- .../ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp | 2 +- .../ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp | 12 +- .../pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp | 26 +- .../ext/pb_ds/detail/pat_trie_/internal_node.hpp | 20 +- .../pb_ds/detail/pat_trie_/iterators_fn_imps.hpp | 4 +- .../ext/pb_ds/detail/pat_trie_/node_iterators.hpp | 6 +- .../ext/pb_ds/detail/pat_trie_/point_iterators.hpp | 14 +- .../ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp | 2 +- .../ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp | 12 +- .../ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp | 22 +- .../ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp | 2 +- .../ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp | 2 +- .../pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp | 4 +- .../pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp | 28 +- .../ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp | 2 +- .../pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp | 4 +- .../detail/rb_tree_map_/split_join_fn_imps.hpp | 30 +- .../detail/rc_binomial_heap_/debug_fn_imps.hpp | 26 +- .../detail/rc_binomial_heap_/erase_fn_imps.hpp | 4 +- .../detail/rc_binomial_heap_/insert_fn_imps.hpp | 18 +- .../resize_policy/hash_prime_size_policy_imp.hpp | 4 +- .../detail/resize_policy/sample_resize_policy.hpp | 4 +- .../detail/resize_policy/sample_resize_trigger.hpp | 5 +- .../detail/resize_policy/sample_size_policy.hpp | 4 +- .../ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp | 2 +- .../ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp | 16 +- .../ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp | 4 +- .../pb_ds/detail/splay_tree_/insert_fn_imps.hpp | 6 +- .../ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp | 22 +- .../detail/splay_tree_/split_join_fn_imps.hpp | 12 +- .../thin_heap_/constructors_destructor_fn_imps.hpp | 8 +- .../ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp | 18 +- .../ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp | 32 +- .../ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp | 2 +- .../ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp | 70 ++-- .../pb_ds/detail/thin_heap_/split_join_fn_imps.hpp | 14 +- .../detail/tree_policy/sample_tree_node_update.hpp | 4 +- .../trie_policy/sample_trie_e_access_traits.hpp | 4 +- .../detail/trie_policy/sample_trie_node_update.hpp | 4 +- .../detail/unordered_iterator/const_iterator.hpp | 2 +- .../unordered_iterator/const_point_iterator.hpp | 6 +- .../pb_ds/detail/unordered_iterator/iterator.hpp | 6 +- .../detail/unordered_iterator/point_iterator.hpp | 6 +- libstdc++-v3/include/ext/pb_ds/exception.hpp | 4 +- libstdc++-v3/include/ext/pb_ds/hash_policy.hpp | 21 +- .../include/ext/pb_ds/list_update_policy.hpp | 9 +- libstdc++-v3/include/ext/pb_ds/priority_queue.hpp | 10 +- libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp | 3 +- libstdc++-v3/include/ext/pb_ds/tree_policy.hpp | 3 +- libstdc++-v3/include/ext/pb_ds/trie_policy.hpp | 3 +- libstdc++-v3/include/ext/rc_string_base.h | 2 +- libstdc++-v3/include/ext/sso_string_base.h | 2 +- libstdc++-v3/include/ext/string_conversions.h | 4 +- libstdc++-v3/include/ext/throw_allocator.h | 2 +- libstdc++-v3/include/parallel/base.h | 8 +- libstdc++-v3/include/parallel/basic_iterator.h | 3 +- libstdc++-v3/include/parallel/multiseq_selection.h | 10 +- libstdc++-v3/include/parallel/multiway_merge.h | 4 +- libstdc++-v3/include/parallel/multiway_mergesort.h | 2 +- libstdc++-v3/include/parallel/partition.h | 2 +- libstdc++-v3/include/profile/impl/profiler_node.h | 6 +- libstdc++-v3/include/profile/impl/profiler_trace.h | 26 +- libstdc++-v3/include/std/atomic | 2 +- libstdc++-v3/include/std/bitset | 1 - libstdc++-v3/include/std/fstream | 6 +- libstdc++-v3/include/std/iterator | 3 +- libstdc++-v3/include/std/mutex | 1 - libstdc++-v3/include/std/thread | 1 - libstdc++-v3/include/std/type_traits | 2 +- libstdc++-v3/include/std/valarray | 3 +- libstdc++-v3/include/tr1/type_traits | 5 +- libstdc++-v3/libsupc++/initializer_list | 4 +- libstdc++-v3/libsupc++/new | 2 +- libstdc++-v3/src/chrono.cc | 4 +- libstdc++-v3/src/condition_variable.cc | 4 +- libstdc++-v3/src/localename.cc | 2 +- libstdc++-v3/src/mt_allocator.cc | 36 +- libstdc++-v3/src/thread.cc | 4 +- .../18_support/bad_exception/23591_thread-1.c | 16 +- .../testsuite/18_support/new_delete_placement.cc | 4 +- libstdc++-v3/testsuite/18_support/pthread_guard.cc | 8 +- .../21_strings/basic_string/cons/char/5.cc | 4 +- .../21_strings/basic_string/cons/wchar_t/5.cc | 4 +- .../21_strings/basic_string/operations/char/1.cc | 4 +- .../basic_string/operations/wchar_t/1.cc | 4 +- .../testsuite/21_strings/basic_string/pthread4.cc | 10 +- .../testsuite/22_locale/ctype/is/char/1.cc | 7 +- .../testsuite/22_locale/ctype/is/wchar_t/1.cc | 7 +- .../22_locale/locale/cons/12658_thread-1.cc | 6 +- libstdc++-v3/testsuite/22_locale/locale/cons/2.cc | 9 +- .../testsuite/22_locale/locale/cons/29217.cc | 4 +- .../locale/global_locale_objects/14071.cc | 4 +- .../22_locale/locale/global_locale_objects/2.cc | 6 +- .../22_locale/time_put/put/char/12439_1.cc | 4 +- .../22_locale/time_put/put/char/12439_3.cc | 4 +- libstdc++-v3/testsuite/23_containers/list/23781.cc | 3 +- .../testsuite/23_containers/list/pthread1.cc | 3 +- libstdc++-v3/testsuite/23_containers/map/23781.cc | 3 +- .../testsuite/23_containers/map/pthread6.cc | 3 +- .../testsuite/23_containers/multimap/23781.cc | 3 +- .../testsuite/23_containers/multiset/23781.cc | 3 +- libstdc++-v3/testsuite/23_containers/set/23781.cc | 3 +- .../24_iterators/ostreambuf_iterator/2.cc | 4 +- .../testsuite/27_io/basic_filebuf/close/char/1.cc | 10 +- .../27_io/basic_filebuf/close/char/12790-3.cc | 4 +- .../testsuite/27_io/basic_filebuf/close/char/2.cc | 6 +- .../27_io/basic_filebuf/close/char/9964.cc | 6 +- .../27_io/basic_filebuf/close/wchar_t/12790-3.cc | 4 +- .../27_io/basic_filebuf/imbue/wchar_t/14975-2.cc | 5 +- .../testsuite/27_io/basic_filebuf/open/char/1.cc | 6 +- .../testsuite/27_io/basic_filebuf/open/char/2.cc | 4 +- .../27_io/basic_filebuf/open/char/9507.cc | 5 +- .../basic_filebuf/overflow/wchar_t/11305-1.cc | 4 +- .../basic_filebuf/overflow/wchar_t/11305-2.cc | 4 +- .../basic_filebuf/overflow/wchar_t/11305-3.cc | 4 +- .../basic_filebuf/overflow/wchar_t/11305-4.cc | 4 +- .../testsuite/27_io/basic_filebuf/setbuf/char/1.cc | 6 +- .../27_io/basic_filebuf/sputc/char/1057.cc | 4 +- .../27_io/basic_filebuf/sputn/char/1057.cc | 4 +- .../testsuite/27_io/basic_ios/clear/char/1.cc | 4 +- .../testsuite/27_io/basic_ios/copyfmt/char/1.cc | 10 +- .../testsuite/27_io/basic_ios/copyfmt/char/2.cc | 6 +- .../testsuite/27_io/basic_ios/exceptions/char/1.cc | 8 +- .../testsuite/27_io/basic_ios/locales/char/1.cc | 4 +- .../testsuite/27_io/basic_iostream/cons/2020.cc | 4 +- .../testsuite/27_io/basic_istream/cons/3.cc | 5 +- .../basic_istream/extractors_arithmetic/char/01.cc | 5 +- .../extractors_arithmetic/wchar_t/01.cc | 4 +- .../basic_istream/extractors_character/char/1.cc | 4 +- .../basic_istream/extractors_character/char/2.cc | 4 +- .../basic_istream/extractors_character/char/3.cc | 4 +- .../extractors_character/char/9826.cc | 4 +- .../extractors_character/wchar_t/1.cc | 4 +- .../extractors_character/wchar_t/2.cc | 4 +- .../extractors_character/wchar_t/3.cc | 4 +- .../27_io/basic_istream/extractors_other/char/1.cc | 5 +- .../extractors_other/char/exceptions_null.cc | 6 +- .../basic_istream/extractors_other/wchar_t/1.cc | 4 +- .../extractors_other/wchar_t/exceptions_null.cc | 6 +- .../testsuite/27_io/basic_istream/get/char/1.cc | 5 +- .../testsuite/27_io/basic_istream/get/wchar_t/1.cc | 4 +- .../27_io/basic_istream/getline/char/1.cc | 7 +- .../27_io/basic_istream/getline/wchar_t/1.cc | 6 +- .../testsuite/27_io/basic_istream/ignore/char/1.cc | 5 +- .../27_io/basic_istream/ignore/wchar_t/1.cc | 4 +- .../testsuite/27_io/basic_istream/peek/char/1.cc | 5 +- .../27_io/basic_istream/peek/wchar_t/1.cc | 4 +- .../testsuite/27_io/basic_istream/read/char/1.cc | 4 +- .../27_io/basic_istream/read/wchar_t/1.cc | 4 +- .../testsuite/27_io/basic_ofstream/pthread2.cc | 6 +- .../testsuite/27_io/basic_ostream/cons/2020.cc | 5 +- .../basic_ostream/inserters_character/char/8.cc | 4 +- .../basic_ostream/inserters_character/wchar_t/8.cc | 6 +- .../27_io/basic_ostream/inserters_other/char/1.cc | 5 +- .../inserters_other/char/exceptions_null.cc | 6 +- .../basic_ostream/inserters_other/wchar_t/1.cc | 4 +- .../inserters_other/wchar_t/exceptions_null.cc | 6 +- .../testsuite/27_io/basic_ostream/sentry/pod/1.cc | 5 +- .../27_io/basic_ostringstream/pthread3.cc | 6 +- .../27_io/basic_streambuf/overflow/char/1.cc | 15 +- .../27_io/basic_streambuf/overflow/wchar_t/1.cc | 14 +- .../27_io/basic_streambuf/sgetc/char/1.cc | 15 +- .../27_io/basic_streambuf/sgetc/wchar_t/1.cc | 14 +- .../27_io/basic_streambuf/sgetn/char/1.cc | 15 +- .../27_io/basic_streambuf/sgetn/wchar_t/1.cc | 14 +- .../27_io/basic_streambuf/sputc/char/1057.cc | 4 +- .../27_io/basic_streambuf/sputc/wchar_t/1057.cc | 4 +- .../27_io/basic_streambuf/sputn/char/1.cc | 15 +- .../27_io/basic_streambuf/sputn/char/1057.cc | 4 +- .../27_io/basic_streambuf/sputn/wchar_t/1.cc | 15 +- .../27_io/basic_streambuf/sputn/wchar_t/1057.cc | 4 +- .../27_io/basic_stringbuf/sputc/char/1057.cc | 4 +- .../27_io/basic_stringbuf/sputc/wchar_t/1057.cc | 4 +- .../27_io/basic_stringbuf/sputn/char/1057.cc | 4 +- .../27_io/basic_stringbuf/sputn/wchar_t/1057.cc | 4 +- libstdc++-v3/testsuite/27_io/objects/char/10.cc | 4 +- libstdc++-v3/testsuite/27_io/objects/char/5268.cc | 4 +- .../testsuite/27_io/objects/char/9661-1.cc | 4 +- .../testsuite/27_io/objects/wchar_t/5268.cc | 4 +- .../29_atomics/atomic_address/cons/aggregate.cc | 3 +- .../29_atomics/atomic_address/cons/single_value.cc | 4 +- .../testsuite/30_threads/mutex/cons/assign_neg.cc | 4 +- .../testsuite/30_threads/mutex/cons/copy_neg.cc | 4 +- .../30_threads/recursive_mutex/cons/assign_neg.cc | 4 +- .../30_threads/recursive_mutex/cons/copy_neg.cc | 4 +- .../recursive_timed_mutex/cons/assign_neg.cc | 4 +- .../recursive_timed_mutex/cons/copy_neg.cc | 4 +- .../testsuite/30_threads/thread/cons/assign_neg.cc | 2 +- .../testsuite/30_threads/thread/cons/copy_neg.cc | 2 +- .../30_threads/timed_mutex/cons/assign_neg.cc | 4 +- .../30_threads/timed_mutex/cons/copy_neg.cc | 4 +- .../testsuite/ext/mt_allocator/22309_thread.cc | 6 +- libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc | 6 +- libstdc++-v3/testsuite/ext/slist/23781.cc | 3 +- .../testsuite/ext/stdio_filebuf/char/10063-2.cc | 4 +- .../requirements/iterator_null_neg.cc | 3 +- .../requirements/iterator_null_neg.cc | 3 +- .../rand/assoc/container_rand_regression_test.tcc | 52 +-- .../regression/rand/assoc/rand_regression_test.hpp | 4 +- .../container_rand_regression_test.tcc | 18 +- .../rand/priority_queue/rand_regression_test.hpp | 4 +- .../testsuite/util/replacement_memory_operators.h | 6 +- libstdc++-v3/testsuite/util/testsuite_allocator.h | 6 +- libstdc++-v3/testsuite/util/testsuite_hooks.cc | 4 +- libstdc++-v3/testsuite/util/testsuite_io.h | 38 +- libstdc++-v3/testsuite/util/testsuite_iterators.h | 8 +- .../testsuite/util/testsuite_performance.h | 20 +- 317 files changed, 1685 insertions(+), 1229 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a986e8d6325..ff8a796ceda 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,431 @@ +2010-06-03 Paolo Carlini + + * 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 , + 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. + 2010-06-02 Jonathan Wakely * testsuite/tr1/2_general_utilities/shared_ptr/cons/pointer.cc: Fix diff --git a/libstdc++-v3/include/backward/hash_fun.h b/libstdc++-v3/include/backward/hash_fun.h index b7b14a1e418..66e31d844cd 100644 --- a/libstdc++-v3/include/backward/hash_fun.h +++ b/libstdc++-v3/include/backward/hash_fun.h @@ -57,7 +57,7 @@ #ifndef _BACKWARD_HASH_FUN_H #define _BACKWARD_HASH_FUN_H 1 -#include +#include _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index d450a4717de..ab71ad67e17 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -1,7 +1,7 @@ // Components for manipulating sequences of characters -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -130,7 +130,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif // NB: Not required, but considered best practice. if (__gnu_cxx::__is_null_pointer(__beg) && __beg != __end) - __throw_logic_error(__N("basic_string::_S_construct NULL not valid")); + __throw_logic_error(__N("basic_string::_S_construct null not valid")); const size_type __dnew = static_cast(std::distance(__beg, __end)); diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index 054fcf27e5e..cffd7fb2d05 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/libstdc++-v3/include/bits/boost_concept_check.h @@ -1,6 +1,7 @@ // -*- C++ -*- -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 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 @@ -41,7 +42,7 @@ #pragma GCC system_header -#include // for ptrdiff_t, used next +#include #include // for traits and tags _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 3746696458a..9dc9ac24cd8 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -1,7 +1,7 @@ // Predefined symbols and macros -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -376,4 +376,19 @@ _GLIBCXX_END_NAMESPACE # endif #endif +#ifdef __cplusplus + +_GLIBCXX_BEGIN_NAMESPACE(std) + + typedef __SIZE_TYPE__ size_t; + typedef __PTRDIFF_TYPE__ ptrdiff_t; + +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + typedef decltype(nullptr) nullptr_t; +#endif + +_GLIBCXX_END_NAMESPACE + +#endif // __cplusplus + // End of prewritten config; the discovered settings follow. diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index c5f7f8c52af..c498f48caee 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -64,21 +64,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std) if (_M_buf_allocated) { delete [] _M_buf; - _M_buf = NULL; + _M_buf = 0; _M_buf_allocated = false; } delete [] _M_ext_buf; - _M_ext_buf = NULL; + _M_ext_buf = 0; _M_ext_buf_size = 0; - _M_ext_next = NULL; - _M_ext_end = NULL; + _M_ext_next = 0; + _M_ext_end = 0; } template basic_filebuf<_CharT, _Traits>:: basic_filebuf() : __streambuf_type(), _M_lock(), _M_file(&_M_lock), _M_mode(ios_base::openmode(0)), _M_state_beg(), _M_state_cur(), - _M_state_last(), _M_buf(NULL), _M_buf_size(BUFSIZ), + _M_state_last(), _M_buf(0), _M_buf_size(BUFSIZ), _M_buf_allocated(false), _M_reading(false), _M_writing(false), _M_pback(), _M_pback_cur_save(0), _M_pback_end_save(0), _M_pback_init(false), _M_codecvt(0), _M_ext_buf(0), _M_ext_buf_size(0), _M_ext_next(0), @@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) basic_filebuf<_CharT, _Traits>:: open(const char* __s, ios_base::openmode __mode) { - __filebuf_type *__ret = NULL; + __filebuf_type *__ret = 0; if (!this->is_open()) { _M_file.open(__s, __mode); @@ -128,7 +128,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) close() { if (!this->is_open()) - return NULL; + return 0; bool __testfail = false; { @@ -167,7 +167,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __testfail = true; if (__testfail) - return NULL; + return 0; else return this; } diff --git a/libstdc++-v3/include/bits/functional_hash.h b/libstdc++-v3/include/bits/functional_hash.h index aaa05aad689..a207ffa6bd0 100644 --- a/libstdc++-v3/include/bits/functional_hash.h +++ b/libstdc++-v3/include/bits/functional_hash.h @@ -32,7 +32,7 @@ #pragma GCC system_header -#include +#include #include namespace std diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 2e18f7da8ed..79bfd03026d 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -1587,12 +1587,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) bool _M_allocated; - __numpunct_cache(size_t __refs = 0) : facet(__refs), - _M_grouping(NULL), _M_grouping_size(0), _M_use_grouping(false), - _M_truename(NULL), _M_truename_size(0), _M_falsename(NULL), - _M_falsename_size(0), _M_decimal_point(_CharT()), - _M_thousands_sep(_CharT()), _M_allocated(false) - { } + __numpunct_cache(size_t __refs = 0) + : facet(__refs), _M_grouping(0), _M_grouping_size(0), + _M_use_grouping(false), + _M_truename(0), _M_truename_size(0), _M_falsename(0), + _M_falsename_size(0), _M_decimal_point(_CharT()), + _M_thousands_sep(_CharT()), _M_allocated(false) + { } ~__numpunct_cache(); @@ -1657,7 +1658,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param refs Refcount to pass to the base class. */ explicit - numpunct(size_t __refs = 0) : facet(__refs), _M_data(NULL) + numpunct(size_t __refs = 0) + : facet(__refs), _M_data(0) { _M_initialize_numpunct(); } /** @@ -1685,7 +1687,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ explicit numpunct(__c_locale __cloc, size_t __refs = 0) - : facet(__refs), _M_data(NULL) + : facet(__refs), _M_data(0) { _M_initialize_numpunct(__cloc); } /** @@ -1841,7 +1843,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // For use at construction time only. void - _M_initialize_numpunct(__c_locale __cloc = NULL); + _M_initialize_numpunct(__c_locale __cloc = 0); }; template diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 1608e2c42da..52bafd36dfe 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1,7 +1,7 @@ // Locale support -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const locale::facet** __caches = __loc._M_impl->_M_caches; if (!__caches[__i]) { - __numpunct_cache<_CharT>* __tmp = NULL; + __numpunct_cache<_CharT>* __tmp = 0; __try { __tmp = new __numpunct_cache<_CharT>; diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h index a25e0acd2c0..fdc810d12be 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.h +++ b/libstdc++-v3/include/bits/locale_facets_nonio.h @@ -118,20 +118,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std) bool _M_allocated; __timepunct_cache(size_t __refs = 0) : facet(__refs), - _M_date_format(NULL), _M_date_era_format(NULL), _M_time_format(NULL), - _M_time_era_format(NULL), _M_date_time_format(NULL), - _M_date_time_era_format(NULL), _M_am(NULL), _M_pm(NULL), - _M_am_pm_format(NULL), _M_day1(NULL), _M_day2(NULL), _M_day3(NULL), - _M_day4(NULL), _M_day5(NULL), _M_day6(NULL), _M_day7(NULL), - _M_aday1(NULL), _M_aday2(NULL), _M_aday3(NULL), _M_aday4(NULL), - _M_aday5(NULL), _M_aday6(NULL), _M_aday7(NULL), _M_month01(NULL), - _M_month02(NULL), _M_month03(NULL), _M_month04(NULL), _M_month05(NULL), - _M_month06(NULL), _M_month07(NULL), _M_month08(NULL), _M_month09(NULL), - _M_month10(NULL), _M_month11(NULL), _M_month12(NULL), _M_amonth01(NULL), - _M_amonth02(NULL), _M_amonth03(NULL), _M_amonth04(NULL), - _M_amonth05(NULL), _M_amonth06(NULL), _M_amonth07(NULL), - _M_amonth08(NULL), _M_amonth09(NULL), _M_amonth10(NULL), - _M_amonth11(NULL), _M_amonth12(NULL), _M_allocated(false) + _M_date_format(0), _M_date_era_format(0), _M_time_format(0), + _M_time_era_format(0), _M_date_time_format(0), + _M_date_time_era_format(0), _M_am(0), _M_pm(0), + _M_am_pm_format(0), _M_day1(0), _M_day2(0), _M_day3(0), + _M_day4(0), _M_day5(0), _M_day6(0), _M_day7(0), + _M_aday1(0), _M_aday2(0), _M_aday3(0), _M_aday4(0), + _M_aday5(0), _M_aday6(0), _M_aday7(0), _M_month01(0), + _M_month02(0), _M_month03(0), _M_month04(0), _M_month05(0), + _M_month06(0), _M_month07(0), _M_month08(0), _M_month09(0), + _M_month10(0), _M_month11(0), _M_month12(0), _M_amonth01(0), + _M_amonth02(0), _M_amonth03(0), _M_amonth04(0), + _M_amonth05(0), _M_amonth06(0), _M_amonth07(0), + _M_amonth08(0), _M_amonth09(0), _M_amonth10(0), + _M_amonth11(0), _M_amonth12(0), _M_allocated(false) { } ~__timepunct_cache(); @@ -313,7 +313,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // For use at construction time only. void - _M_initialize_timepunct(__c_locale __cloc = NULL); + _M_initialize_timepunct(__c_locale __cloc = 0); }; template @@ -883,11 +883,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) bool _M_allocated; __moneypunct_cache(size_t __refs = 0) : facet(__refs), - _M_grouping(NULL), _M_grouping_size(0), _M_use_grouping(false), + _M_grouping(0), _M_grouping_size(0), _M_use_grouping(false), _M_decimal_point(_CharT()), _M_thousands_sep(_CharT()), - _M_curr_symbol(NULL), _M_curr_symbol_size(0), - _M_positive_sign(NULL), _M_positive_sign_size(0), - _M_negative_sign(NULL), _M_negative_sign_size(0), + _M_curr_symbol(0), _M_curr_symbol_size(0), + _M_positive_sign(0), _M_positive_sign_size(0), + _M_negative_sign(0), _M_negative_sign_size(0), _M_frac_digits(0), _M_pos_format(money_base::pattern()), _M_neg_format(money_base::pattern()), _M_allocated(false) @@ -955,7 +955,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param refs Passed to the base facet class. */ explicit - moneypunct(size_t __refs = 0) : facet(__refs), _M_data(NULL) + moneypunct(size_t __refs = 0) + : facet(__refs), _M_data(0) { _M_initialize_moneypunct(); } /** @@ -983,7 +984,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ explicit moneypunct(__c_locale __cloc, const char* __s, size_t __refs = 0) - : facet(__refs), _M_data(NULL) + : facet(__refs), _M_data(0) { _M_initialize_moneypunct(__cloc, __s); } /** @@ -1271,8 +1272,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // For use at construction time only. void - _M_initialize_moneypunct(__c_locale __cloc = NULL, - const char* __name = NULL); + _M_initialize_moneypunct(__c_locale __cloc = 0, + const char* __name = 0); }; template diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.tcc b/libstdc++-v3/include/bits/locale_facets_nonio.tcc index 48a913901e7..b5c77b9d7c0 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc @@ -44,7 +44,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const locale::facet** __caches = __loc._M_impl->_M_caches; if (!__caches[__i]) { - __moneypunct_cache<_CharT, _Intl>* __tmp = NULL; + __moneypunct_cache<_CharT, _Intl>* __tmp = 0; __try { __tmp = new __moneypunct_cache<_CharT, _Intl>; diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h index a137f982bed..98755dc7e57 100644 --- a/libstdc++-v3/include/bits/move.h +++ b/libstdc++-v3/include/bits/move.h @@ -31,7 +31,6 @@ #define _MOVE_H 1 #include -#include #include _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 0489c413b95..fc3047b6bed 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -58,7 +58,6 @@ #define _STL_ALGOBASE_H 1 #include -#include #include #include #include diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h index 07687bd2cd3..d934f434e6d 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_types.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h @@ -63,7 +63,6 @@ #pragma GCC system_header #include -#include _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/c_global/cstddef b/libstdc++-v3/include/c_global/cstddef index ce2d310244c..d9a7383e68d 100644 --- a/libstdc++-v3/include/c_global/cstddef +++ b/libstdc++-v3/include/c_global/cstddef @@ -42,15 +42,3 @@ #include #include - -#ifndef _GLIBCXX_CSTDDEF -#define _GLIBCXX_CSTDDEF 1 - -_GLIBCXX_BEGIN_NAMESPACE(std) - - using ::ptrdiff_t; - using ::size_t; - -_GLIBCXX_END_NAMESPACE - -#endif diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio index f87af196936..b547fbe40b8 100644 --- a/libstdc++-v3/include/c_global/cstdio +++ b/libstdc++-v3/include/c_global/cstdio @@ -41,7 +41,6 @@ #pragma GCC system_header #include -#include #include #ifndef _GLIBCXX_CSTDIO @@ -151,13 +150,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" int - (snprintf)(char * restrict, size_t, const char * restrict, ...) throw (); + (snprintf)(char * restrict, std::size_t, const char * restrict, ...) throw (); extern "C" int (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list); extern "C" int (vscanf)(const char * restrict, __gnuc_va_list); extern "C" int - (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list) - throw (); + (vsnprintf)(char * restrict, std::size_t, const char * restrict, + __gnuc_va_list) throw (); extern "C" int (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list) throw (); diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib index f4ff810cf71..da95c0fe56c 100644 --- a/libstdc++-v3/include/c_global/cstdlib +++ b/libstdc++-v3/include/c_global/cstdlib @@ -41,7 +41,6 @@ #pragma GCC system_header #include -#include #ifndef _GLIBCXX_CSTDLIB #define _GLIBCXX_CSTDLIB 1 diff --git a/libstdc++-v3/include/c_global/cstring b/libstdc++-v3/include/c_global/cstring index 445202035d5..21721be67ed 100644 --- a/libstdc++-v3/include/c_global/cstring +++ b/libstdc++-v3/include/c_global/cstring @@ -41,7 +41,6 @@ #pragma GCC system_header #include -#include #include #ifndef _GLIBCXX_CSTRING diff --git a/libstdc++-v3/include/c_global/ctime b/libstdc++-v3/include/c_global/ctime index 55f1f069766..f5bb49ccbc9 100644 --- a/libstdc++-v3/include/c_global/ctime +++ b/libstdc++-v3/include/c_global/ctime @@ -40,7 +40,7 @@ #pragma GCC system_header -#include +#include #include #ifndef _GLIBCXX_CTIME diff --git a/libstdc++-v3/include/c_global/cwchar b/libstdc++-v3/include/c_global/cwchar index 537f39a023b..b16eb468572 100644 --- a/libstdc++-v3/include/c_global/cwchar +++ b/libstdc++-v3/include/c_global/cwchar @@ -41,7 +41,6 @@ #pragma GCC system_header #include -#include #if _GLIBCXX_HAVE_WCHAR_H #include diff --git a/libstdc++-v3/include/c_std/cstddef b/libstdc++-v3/include/c_std/cstddef index 93fed5db6ac..006c432d7bc 100644 --- a/libstdc++-v3/include/c_std/cstddef +++ b/libstdc++-v3/include/c_std/cstddef @@ -45,11 +45,4 @@ #include #include -_GLIBCXX_BEGIN_NAMESPACE(std) - - using ::ptrdiff_t; - using ::size_t; - -_GLIBCXX_END_NAMESPACE - #endif diff --git a/libstdc++-v3/include/c_std/cstdio b/libstdc++-v3/include/c_std/cstdio index a697437a662..4a8acdddb62 100644 --- a/libstdc++-v3/include/c_std/cstdio +++ b/libstdc++-v3/include/c_std/cstdio @@ -43,8 +43,6 @@ #pragma GCC system_header #include -#include - #include // Get rid of those macros defined in in lieu of real functions. @@ -151,13 +149,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" int - (snprintf)(char * restrict, size_t, const char * restrict, ...) throw (); + (snprintf)(char * restrict, std::size_t, const char * restrict, ...) throw (); extern "C" int (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list); extern "C" int (vscanf)(const char * restrict, __gnuc_va_list); extern "C" int - (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list) - throw (); + (vsnprintf)(char * restrict, std::size_t, const char * restrict, + __gnuc_va_list) throw (); extern "C" int (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list) throw (); diff --git a/libstdc++-v3/include/c_std/cstdlib b/libstdc++-v3/include/c_std/cstdlib index c1e3379c121..734745a6775 100644 --- a/libstdc++-v3/include/c_std/cstdlib +++ b/libstdc++-v3/include/c_std/cstdlib @@ -43,7 +43,6 @@ #pragma GCC system_header #include -#include #if !_GLIBCXX_HOSTED // The C standard does not require a freestanding implementation to diff --git a/libstdc++-v3/include/c_std/cstring b/libstdc++-v3/include/c_std/cstring index 914365655ec..06bf12fba9d 100644 --- a/libstdc++-v3/include/c_std/cstring +++ b/libstdc++-v3/include/c_std/cstring @@ -44,7 +44,6 @@ #pragma GCC system_header #include -#include #include // Get rid of those macros defined in in lieu of real functions. diff --git a/libstdc++-v3/include/c_std/ctime b/libstdc++-v3/include/c_std/ctime index dca90eb8d88..459c8fc7b60 100644 --- a/libstdc++-v3/include/c_std/ctime +++ b/libstdc++-v3/include/c_std/ctime @@ -42,7 +42,7 @@ #pragma GCC system_header -#include +#include #include // Get rid of those macros defined in in lieu of real functions. diff --git a/libstdc++-v3/include/c_std/cwchar b/libstdc++-v3/include/c_std/cwchar index 3d503674ed1..20c6ca3512a 100644 --- a/libstdc++-v3/include/c_std/cwchar +++ b/libstdc++-v3/include/c_std/cwchar @@ -44,7 +44,6 @@ #pragma GCC system_header #include -#include #if _GLIBCXX_HAVE_WCHAR_H #include diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h index b4b43896d04..a98ebd84a8d 100644 --- a/libstdc++-v3/include/debug/formatter.h +++ b/libstdc++-v3/include/debug/formatter.h @@ -338,7 +338,7 @@ namespace __gnu_debug const _Error_formatter& _M_iterator(const _Iterator& __it, const char* __name = 0) const { - if (_M_num_parameters < size_t(__max_parameters)) + if (_M_num_parameters < std::size_t(__max_parameters)) _M_parameters[_M_num_parameters++] = _Parameter(__it, __name, _Is_iterator()); return *this; @@ -347,7 +347,7 @@ namespace __gnu_debug const _Error_formatter& _M_integer(long __value, const char* __name = 0) const { - if (_M_num_parameters < size_t(__max_parameters)) + if (_M_num_parameters < std::size_t(__max_parameters)) _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); return *this; } @@ -355,7 +355,7 @@ namespace __gnu_debug const _Error_formatter& _M_string(const char* __value, const char* __name = 0) const { - if (_M_num_parameters < size_t(__max_parameters)) + if (_M_num_parameters < std::size_t(__max_parameters)) _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); return *this; } @@ -364,7 +364,7 @@ namespace __gnu_debug const _Error_formatter& _M_sequence(const _Sequence& __seq, const char* __name = 0) const { - if (_M_num_parameters < size_t(__max_parameters)) + if (_M_num_parameters < std::size_t(__max_parameters)) _M_parameters[_M_num_parameters++] = _Parameter(__seq, __name, _Is_sequence()); return *this; @@ -381,7 +381,7 @@ namespace __gnu_debug _M_error() const; private: - _Error_formatter(const char* __file, size_t __line) + _Error_formatter(const char* __file, std::size_t __line) : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0), _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) { _M_get_max_length(); } @@ -402,19 +402,19 @@ namespace __gnu_debug enum { __max_parameters = 9 }; const char* _M_file; - size_t _M_line; + std::size_t _M_line; mutable _Parameter _M_parameters[__max_parameters]; - mutable size_t _M_num_parameters; + mutable std::size_t _M_num_parameters; mutable const char* _M_text; - mutable size_t _M_max_length; + mutable std::size_t _M_max_length; enum { _M_indent = 4 } ; - mutable size_t _M_column; + mutable std::size_t _M_column; mutable bool _M_first_line; mutable bool _M_wordwrap; public: static _Error_formatter - _M_at(const char* __file, size_t __line) + _M_at(const char* __file, std::size_t __line) { return _Error_formatter(__file, __line); } }; } // namespace __gnu_debug diff --git a/libstdc++-v3/include/debug/functions.h b/libstdc++-v3/include/debug/functions.h index a4b1d785844..237c0e66909 100644 --- a/libstdc++-v3/include/debug/functions.h +++ b/libstdc++-v3/include/debug/functions.h @@ -1,6 +1,6 @@ // Debugging support implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -31,7 +31,6 @@ #define _GLIBCXX_DEBUG_FUNCTIONS_H 1 #include -#include // for ptrdiff_t #include // for iterator_traits, categories #include // for __is_integer diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index 36f15fe936c..ca4d0d19b01 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -30,7 +30,7 @@ #ifndef _ARRAY_ALLOCATOR_H #define _ARRAY_ALLOCATOR_H 1 -#include +#include #include #include #include @@ -114,7 +114,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) struct rebind { typedef array_allocator<_Tp1, _Array1> other; }; - array_allocator(array_type* __array = NULL) throw() + array_allocator(array_type* __array = 0) throw() : _M_array(__array), _M_used(size_type()) { } array_allocator(const array_allocator& __o) throw() @@ -122,7 +122,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template array_allocator(const array_allocator<_Tp1, _Array1>&) throw() - : _M_array(NULL), _M_used(size_type()) { } + : _M_array(0), _M_used(size_type()) { } ~array_allocator() throw() { } diff --git a/libstdc++-v3/include/ext/bitmap_allocator.h b/libstdc++-v3/include/ext/bitmap_allocator.h index 05285f548cc..2aa08706c9d 100644 --- a/libstdc++-v3/include/ext/bitmap_allocator.h +++ b/libstdc++-v3/include/ext/bitmap_allocator.h @@ -30,9 +30,8 @@ #ifndef _BITMAP_ALLOCATOR_H #define _BITMAP_ALLOCATOR_H 1 -#include // For std::size_t, and ptrdiff_t. -#include // For __throw_bad_alloc(). #include // For std::pair. +#include // For __throw_bad_alloc(). #include // For greater_equal, and less_equal. #include // For operator new. #include // _GLIBCXX_DEBUG_ASSERT diff --git a/libstdc++-v3/include/ext/codecvt_specializations.h b/libstdc++-v3/include/ext/codecvt_specializations.h index 89adb3f20d4..53295891bac 100644 --- a/libstdc++-v3/include/ext/codecvt_specializations.h +++ b/libstdc++-v3/include/ext/codecvt_specializations.h @@ -1,7 +1,8 @@ // Locale support (codecvt) -*- C++ -*- -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 -// Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +// 2008, 2009, 2010 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -381,7 +382,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // Argument list for iconv specifies a byte sequence. Thus, // all to/from arrays must be brutally casted to char*. char* __cto = reinterpret_cast(__to); - size_t __conv = __iconv_adaptor(iconv,__desc, NULL, NULL, + size_t __conv = __iconv_adaptor(iconv,__desc, 0, 0, &__cto, &__tlen); if (__conv != size_t(-1)) diff --git a/libstdc++-v3/include/ext/functional b/libstdc++-v3/include/ext/functional index 546b9c68d6c..7cf6a45a0a3 100644 --- a/libstdc++-v3/include/ext/functional +++ b/libstdc++-v3/include/ext/functional @@ -1,6 +1,6 @@ // Functional extensions -*- C++ -*- -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -60,7 +60,6 @@ #pragma GCC system_header #include -#include _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/include/ext/mt_allocator.h b/libstdc++-v3/include/ext/mt_allocator.h index 8fdb2f6393b..1f6561db464 100644 --- a/libstdc++-v3/include/ext/mt_allocator.h +++ b/libstdc++-v3/include/ext/mt_allocator.h @@ -154,11 +154,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) explicit __pool_base() - : _M_options(_Tune()), _M_binmap(NULL), _M_init(false) { } + : _M_options(_Tune()), _M_binmap(0), _M_init(false) { } explicit __pool_base(const _Tune& __options) - : _M_options(__options), _M_binmap(NULL), _M_init(false) { } + : _M_options(__options), _M_binmap(0), _M_init(false) { } private: explicit @@ -235,10 +235,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { } explicit __pool() - : _M_bin(NULL), _M_bin_size(1) { } + : _M_bin(0), _M_bin_size(1) { } explicit __pool(const __pool_base::_Tune& __tune) - : __pool_base(__tune), _M_bin(NULL), _M_bin_size(1) { } + : __pool_base(__tune), _M_bin(0), _M_bin_size(1) { } private: // An "array" of bin_records each of which represents a specific @@ -358,12 +358,12 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _M_get_thread_id(); explicit __pool() - : _M_bin(NULL), _M_bin_size(1), _M_thread_freelist(NULL) + : _M_bin(0), _M_bin_size(1), _M_thread_freelist(0) { } explicit __pool(const __pool_base::_Tune& __tune) - : __pool_base(__tune), _M_bin(NULL), _M_bin_size(1), - _M_thread_freelist(NULL) + : __pool_base(__tune), _M_bin(0), _M_bin_size(1), + _M_thread_freelist(0) { } private: diff --git a/libstdc++-v3/include/ext/new_allocator.h b/libstdc++-v3/include/ext/new_allocator.h index beaddddf9ee..54505654207 100644 --- a/libstdc++-v3/include/ext/new_allocator.h +++ b/libstdc++-v3/include/ext/new_allocator.h @@ -30,6 +30,7 @@ #ifndef _NEW_ALLOCATOR_H #define _NEW_ALLOCATOR_H 1 +#include #include #include #include diff --git a/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp b/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp index dca953b4911..9cec3b72c54 100644 --- a/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp +++ b/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp @@ -41,6 +41,7 @@ #ifndef PB_DS_ASSOC_CNTNR_HPP #define PB_DS_ASSOC_CNTNR_HPP +#include #include #include #include diff --git a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp index 757b90956de..d9cc2dbfc44 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp @@ -38,8 +38,8 @@ * Contains an implementation class for tree-like classes. */ -#ifndef PB_DS_NULL_NODE_METADATA_HPP -#define PB_DS_NULL_NODE_METADATA_HPP +#ifndef PB_DS_0_NODE_METADATA_HPP +#define PB_DS_0_NODE_METADATA_HPP #include diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp index 925d204dc6b..b9f80e960aa 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp @@ -92,7 +92,7 @@ PB_DS_CLASS_NAME(const PB_DS_CLASS_C_DEC& other) : __try { m_p_head->m_p_parent = recursive_copy_node(other.m_p_head->m_p_parent); - if (m_p_head->m_p_parent != NULL) + if (m_p_head->m_p_parent != 0) m_p_head->m_p_parent->m_p_parent = m_p_head; m_size = other.m_size; initialize_min_max(); @@ -142,7 +142,7 @@ void PB_DS_CLASS_C_DEC:: initialize() { - m_p_head->m_p_parent = NULL; + m_p_head->m_p_parent = 0; m_p_head->m_p_left = m_p_head; m_p_head->m_p_right = m_p_head; m_size = 0; @@ -153,8 +153,8 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: recursive_copy_node(const node_pointer p_nd) { - if (p_nd == NULL) - return (NULL); + if (p_nd == 0) + return (0); node_pointer p_ret = s_node_allocator.allocate(1); __try @@ -167,7 +167,7 @@ recursive_copy_node(const node_pointer p_nd) __throw_exception_again; } - p_ret->m_p_left = p_ret->m_p_right = NULL; + p_ret->m_p_left = p_ret->m_p_right = 0; __try { @@ -180,10 +180,10 @@ recursive_copy_node(const node_pointer p_nd) __throw_exception_again; } - if (p_ret->m_p_left != NULL) + if (p_ret->m_p_left != 0) p_ret->m_p_left->m_p_parent = p_ret; - if (p_ret->m_p_right != NULL) + if (p_ret->m_p_right != 0) p_ret->m_p_right->m_p_parent = p_ret; _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_ret);) @@ -195,7 +195,7 @@ void PB_DS_CLASS_C_DEC:: initialize_min_max() { - if (m_p_head->m_p_parent == NULL) + if (m_p_head->m_p_parent == 0) { m_p_head->m_p_left = m_p_head->m_p_right = m_p_head; return; @@ -203,14 +203,14 @@ initialize_min_max() { node_pointer p_min = m_p_head->m_p_parent; - while (p_min->m_p_left != NULL) + while (p_min->m_p_left != 0) p_min = p_min->m_p_left; m_p_head->m_p_left = p_min; } { node_pointer p_max = m_p_head->m_p_parent; - while (p_max->m_p_right != NULL) + while (p_max->m_p_right != 0) p_max = p_max->m_p_right; m_p_head->m_p_right = p_max; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp index e3447bd4bec..e1013e78f1b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp @@ -49,7 +49,7 @@ assert_valid() const assert_consistent_with_debug_base(); assert_size(); assert_iterators(); - if (m_p_head->m_p_parent == NULL) + if (m_p_head->m_p_parent == 0) { _GLIBCXX_DEBUG_ASSERT(m_size == 0); } @@ -64,8 +64,8 @@ void PB_DS_CLASS_C_DEC:: structure_only_assert_valid() const { - _GLIBCXX_DEBUG_ASSERT(m_p_head != NULL); - if (m_p_head->m_p_parent == NULL) + _GLIBCXX_DEBUG_ASSERT(m_p_head != 0); + if (m_p_head->m_p_parent == 0) { _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_left == m_p_head); _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_right == m_p_head); @@ -77,7 +77,7 @@ structure_only_assert_valid() const _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_right != m_p_head); } - if (m_p_head->m_p_parent != NULL) + if (m_p_head->m_p_parent != 0) assert_node_consistent(m_p_head->m_p_parent); assert_min(); assert_max(); @@ -96,8 +96,8 @@ typename PB_DS_CLASS_C_DEC::node_consistent_t PB_DS_CLASS_C_DEC:: assert_node_consistent_(const node_pointer p_nd) const { - if (p_nd == NULL) - return (std::make_pair((const_pointer)NULL,(const_pointer)NULL)); + if (p_nd == 0) + return (std::make_pair((const_pointer)0,(const_pointer)0)); assert_node_consistent_with_left(p_nd); assert_node_consistent_with_right(p_nd); @@ -105,18 +105,18 @@ assert_node_consistent_(const node_pointer p_nd) const const std::pair l_range = assert_node_consistent_(p_nd->m_p_left); - if (l_range.second != NULL) + if (l_range.second != 0) _GLIBCXX_DEBUG_ASSERT(Cmp_Fn::operator()(PB_DS_V2F(*l_range.second), PB_DS_V2F(p_nd->m_value))); const std::pair r_range = assert_node_consistent_(p_nd->m_p_right); - if (r_range.first != NULL) + if (r_range.first != 0) _GLIBCXX_DEBUG_ASSERT(Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), PB_DS_V2F(*r_range.first))); - return (std::make_pair((l_range.first != NULL)? l_range.first :& p_nd->m_value,(r_range.second != NULL)? r_range.second :& p_nd->m_value)); + return (std::make_pair((l_range.first != 0)? l_range.first :& p_nd->m_value,(r_range.second != 0)? r_range.second :& p_nd->m_value)); } PB_DS_CLASS_T_DEC @@ -124,7 +124,7 @@ void PB_DS_CLASS_C_DEC:: assert_node_consistent_with_left(const node_pointer p_nd) const { - if (p_nd->m_p_left == NULL) + if (p_nd->m_p_left == 0) return; _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_left->m_p_parent == p_nd); _GLIBCXX_DEBUG_ASSERT(!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), @@ -136,7 +136,7 @@ void PB_DS_CLASS_C_DEC:: assert_node_consistent_with_right(const node_pointer p_nd) const { - if (p_nd->m_p_right == NULL) + if (p_nd->m_p_right == 0) return; _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_right->m_p_parent == p_nd); _GLIBCXX_DEBUG_ASSERT(!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_p_right->m_value), @@ -156,13 +156,13 @@ void PB_DS_CLASS_C_DEC:: assert_min_imp(const node_pointer p_nd) const { - if (p_nd == NULL) + if (p_nd == 0) { _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_left == m_p_head); return; } - if (p_nd->m_p_left == NULL) + if (p_nd->m_p_left == 0) { _GLIBCXX_DEBUG_ASSERT(p_nd == m_p_head->m_p_left); return; @@ -183,13 +183,13 @@ void PB_DS_CLASS_C_DEC:: assert_max_imp(const node_pointer p_nd) const { - if (p_nd == NULL) + if (p_nd == 0) { _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_right == m_p_head); return; } - if (p_nd->m_p_right == NULL) + if (p_nd->m_p_right == 0) { _GLIBCXX_DEBUG_ASSERT(p_nd == m_p_head->m_p_right); return; @@ -254,7 +254,7 @@ void PB_DS_CLASS_C_DEC:: assert_consistent_with_debug_base(const node_pointer p_nd) const { - if (p_nd == NULL) + if (p_nd == 0) return; debug_base::check_key_exists(PB_DS_V2F(p_nd->m_value)); assert_consistent_with_debug_base(p_nd->m_p_left); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp index a000c744cc3..a050a4be7b1 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp @@ -106,7 +106,7 @@ void PB_DS_CLASS_C_DEC:: clear_imp(node_pointer p_nd) { - if (p_nd == NULL) + if (p_nd == 0) return; clear_imp(p_nd->m_p_left); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp index 413304b80a0..74af48a7327 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp @@ -46,7 +46,7 @@ lower_bound(const_key_reference r_key) const node_pointer p_pot = m_p_head; node_pointer p_nd = m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (Cmp_Fn::operator()( PB_DS_V2F(p_nd->m_value), r_key)) @@ -69,7 +69,7 @@ lower_bound(const_key_reference r_key) node_pointer p_pot = m_p_head; node_pointer p_nd = m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (Cmp_Fn::operator()( PB_DS_V2F(p_nd->m_value), r_key)) @@ -92,7 +92,7 @@ upper_bound(const_key_reference r_key) const node_pointer p_pot = m_p_head; node_pointer p_nd = m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value))) { @@ -114,7 +114,7 @@ upper_bound(const_key_reference r_key) node_pointer p_pot = m_p_head; node_pointer p_nd = m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value))) { @@ -138,7 +138,7 @@ find(const_key_reference r_key) node_pointer p_pot = m_p_head; node_pointer p_nd = m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key)) { p_pot = p_nd; @@ -164,7 +164,7 @@ find(const_key_reference r_key) const node_pointer p_pot = m_p_head; node_pointer p_nd = m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key)) { p_pot = p_nd; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp index 3abf0a08d3c..6714c6f10be 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp @@ -53,7 +53,7 @@ insert_leaf(const_reference r_value) node_pointer p_nd = m_p_head->m_p_parent; node_pointer p_pot = m_p_head; - while (p_nd != NULL) + while (p_nd != 0) if (!Cmp_Fn::operator()( PB_DS_V2F(p_nd->m_value), PB_DS_V2F(r_value))) @@ -86,12 +86,12 @@ insert_leaf(const_reference r_value) PB_DS_V2F(r_value))); p_nd = p_pot->m_p_left; - if (p_nd == NULL) + if (p_nd == 0) return (std::make_pair( insert_leaf_new(r_value, p_pot, true), true)); - while (p_nd->m_p_right != NULL) + while (p_nd->m_p_right != 0) p_nd = p_nd->m_p_right; return (std::make_pair( @@ -109,7 +109,7 @@ insert_leaf_new(const_reference r_value, node_pointer p_nd, bool left_nd) if (left_nd) { - _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_left == NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_left == 0); _GLIBCXX_DEBUG_ASSERT(Cmp_Fn::operator()( PB_DS_V2F(r_value), PB_DS_V2F(p_nd->m_value))); @@ -121,7 +121,7 @@ insert_leaf_new(const_reference r_value, node_pointer p_nd, bool left_nd) } else { - _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_right == NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_right == 0); _GLIBCXX_DEBUG_ASSERT(Cmp_Fn::operator()( PB_DS_V2F(p_nd->m_value), PB_DS_V2F(r_value))); @@ -134,7 +134,7 @@ insert_leaf_new(const_reference r_value, node_pointer p_nd, bool left_nd) p_new_nd->m_p_parent = p_nd; - p_new_nd->m_p_left = p_new_nd->m_p_right = NULL; + p_new_nd->m_p_left = p_new_nd->m_p_right = 0; _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_nd)); @@ -159,7 +159,7 @@ insert_imp_empty(const_reference r_value) p_new_node->m_p_parent = m_p_head; - p_new_node->m_p_left = p_new_node->m_p_right = NULL; + p_new_node->m_p_left = p_new_node->m_p_right = 0; _GLIBCXX_DEBUG_ONLY(debug_base::insert_new( PB_DS_V2F(r_value))); @@ -184,7 +184,7 @@ get_new_node_for_leaf_insert(const_reference r_val, false_type) cond.set_no_action(); - p_new_nd->m_p_left = p_new_nd->m_p_right = NULL; + p_new_nd->m_p_left = p_new_nd->m_p_right = 0; ++m_size; @@ -202,7 +202,7 @@ get_new_node_for_leaf_insert(const_reference r_val, true_type) static_cast(&p_new_nd->m_value))) typename node::value_type(r_val); - p_new_nd->m_p_left = p_new_nd->m_p_right = NULL; + p_new_nd->m_p_left = p_new_nd->m_p_right = 0; ++m_size; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp index ed7f1b172c8..e20a4134a8b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp @@ -123,7 +123,7 @@ inline typename PB_DS_CLASS_C_DEC::const_node_iterator PB_DS_CLASS_C_DEC:: node_end() const { - return (const_node_iterator(NULL)); + return (const_node_iterator(0)); } PB_DS_CLASS_T_DEC @@ -131,6 +131,6 @@ inline typename PB_DS_CLASS_C_DEC::node_iterator PB_DS_CLASS_C_DEC:: node_end() { - return (node_iterator(NULL)); + return (node_iterator(0)); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp index 365f02b6ef8..284c0e9bcc9 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp @@ -105,7 +105,7 @@ namespace __gnu_pbds */ inline - bin_search_tree_const_node_it_(const node_pointer p_nd = NULL) : m_p_nd(const_cast(p_nd)) + bin_search_tree_const_node_it_(const node_pointer p_nd = 0) : m_p_nd(const_cast(p_nd)) { } // Access. @@ -197,7 +197,7 @@ namespace __gnu_pbds */ inline - bin_search_tree_node_it_(const node_pointer p_nd = NULL) : PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC( + bin_search_tree_node_it_(const node_pointer p_nd = 0) : PB_DS_TREE_CONST_NODE_ITERATOR_CLASS_C_DEC( const_cast(p_nd)) { } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp index bb249e07057..5bf3f229f5d 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp @@ -124,7 +124,7 @@ namespace __gnu_pbds public: inline - bin_search_tree_const_it_(const Node_Pointer p_nd = NULL) + bin_search_tree_const_it_(const Node_Pointer p_nd = 0) : m_p_nd(const_cast(p_nd)) { } @@ -152,14 +152,14 @@ namespace __gnu_pbds inline const_pointer operator->() const { - _GLIBCXX_DEBUG_ASSERT(m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_nd != 0); return &m_p_nd->m_value; } inline const_reference operator*() const { - _GLIBCXX_DEBUG_ASSERT(m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_nd != 0); return m_p_nd->m_value; } @@ -182,7 +182,7 @@ namespace __gnu_pbds inline PB_DS_TREE_CONST_IT_C_DEC& operator++() { - _GLIBCXX_DEBUG_ASSERT(m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_nd != 0); inc(integral_constant()); return *this; } @@ -225,10 +225,10 @@ namespace __gnu_pbds return; } - if (m_p_nd->m_p_right != NULL) + if (m_p_nd->m_p_right != 0) { m_p_nd = m_p_nd->m_p_right; - while (m_p_nd->m_p_left != NULL) + while (m_p_nd->m_p_left != 0) m_p_nd = m_p_nd->m_p_left; return; } @@ -257,10 +257,10 @@ namespace __gnu_pbds return; } - if (m_p_nd->m_p_left != NULL) + if (m_p_nd->m_p_left != 0) { Node_Pointer p_y = m_p_nd->m_p_left; - while (p_y->m_p_right != NULL) + while (p_y->m_p_right != 0) p_y = p_y->m_p_right; m_p_nd = p_y; return; @@ -297,7 +297,7 @@ namespace __gnu_pbds public: inline - bin_search_tree_it_(const Node_Pointer p_nd = NULL) + bin_search_tree_it_(const Node_Pointer p_nd = 0) : PB_DS_TREE_CONST_IT_C_DEC((Node_Pointer)p_nd) { } @@ -325,14 +325,14 @@ namespace __gnu_pbds inline typename PB_DS_TREE_CONST_IT_C_DEC::pointer operator->() const { - _GLIBCXX_DEBUG_ASSERT(base_it_type::m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(base_it_type::m_p_nd != 0); return &base_it_type::m_p_nd->m_value; } inline typename PB_DS_TREE_CONST_IT_C_DEC::reference operator*() const { - _GLIBCXX_DEBUG_ASSERT(base_it_type::m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(base_it_type::m_p_nd != 0); return base_it_type::m_p_nd->m_value; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp index 667ef84704f..76c543f149a 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp @@ -106,7 +106,7 @@ void PB_DS_CLASS_C_DEC:: clear_imp(node_pointer p_nd) { - if (p_nd == NULL) + if (p_nd == 0) return; clear_imp(p_nd->m_p_left); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp index 0598657fe04..b21e98102df 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp @@ -47,7 +47,7 @@ rotate_left(node_pointer p_x) p_x->m_p_right = p_y->m_p_left; - if (p_y->m_p_left != NULL) + if (p_y->m_p_left != 0) p_y->m_p_left->m_p_parent = p_x; p_y->m_p_parent = p_x->m_p_parent; @@ -78,7 +78,7 @@ rotate_right(node_pointer p_x) p_x->m_p_left = p_y->m_p_right; - if (p_y->m_p_right != NULL) + if (p_y->m_p_right != 0) p_y->m_p_right->m_p_parent = p_x; p_y->m_p_parent = p_x->m_p_parent; @@ -131,7 +131,7 @@ apply_update(node_pointer p_nd, Node_Update_* /*p_update*/) { node_update::operator()( node_iterator(p_nd), - const_node_iterator(static_cast(NULL))); + const_node_iterator(static_cast(0))); } PB_DS_CLASS_T_DEC diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp index 9d2bd6d742d..2c027f6ab98 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp @@ -139,7 +139,7 @@ typename PB_DS_CLASS_C_DEC::size_type PB_DS_CLASS_C_DEC:: recursive_count(node_pointer p) const { - if (p == NULL) + if (p == 0) return 0; return 1 + recursive_count(p->m_p_left) + recursive_count(p->m_p_right); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp index 9cb13f99cca..76cf80bd544 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp @@ -125,7 +125,7 @@ namespace __gnu_pbds inline PB_DS_CLASS_C_DEC& operator++() { - _GLIBCXX_DEBUG_ASSERT(base_type::m_p_e != NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::m_p_e != 0); inc(); return *this; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp index d4013db16fe..ab5efe2bb64 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp @@ -92,7 +92,7 @@ namespace __gnu_pbds // Default constructor. inline - binary_heap_const_point_iterator_() : m_p_e(NULL) { } + binary_heap_const_point_iterator_() : m_p_e(0) { } // Copy constructor. inline @@ -104,7 +104,7 @@ namespace __gnu_pbds inline const_pointer operator->() const { - _GLIBCXX_DEBUG_ASSERT(m_p_e != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_e != 0); return to_ptr(integral_constant()); } @@ -112,7 +112,7 @@ namespace __gnu_pbds inline const_reference operator*() const { - _GLIBCXX_DEBUG_ASSERT(m_p_e != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_e != 0); return *to_ptr(integral_constant()); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp index 04b7d548f2e..dfceb689132 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp @@ -68,8 +68,8 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) const size_type other_actual_size = other.get_new_size_for_arbitrary(ersd); - entry_pointer a_entries = NULL; - entry_pointer a_other_entries = NULL; + entry_pointer a_entries = 0; + entry_pointer a_other_entries = 0; __try { @@ -79,10 +79,10 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) } __catch(...) { - if (a_entries != NULL) + if (a_entries != 0) s_entry_allocator.deallocate(a_entries, actual_size); - if (a_other_entries != NULL) + if (a_other_entries != 0) s_entry_allocator.deallocate(a_other_entries, other_actual_size); __throw_exception_again; @@ -128,8 +128,8 @@ join(PB_DS_CLASS_C_DEC& other) const size_type len = m_size + other.m_size; const size_type actual_size = resize_policy::get_new_size_for_arbitrary(len); - entry_pointer a_entries = NULL; - entry_pointer a_other_entries = NULL; + entry_pointer a_entries = 0; + entry_pointer a_other_entries = 0; __try { @@ -138,10 +138,10 @@ join(PB_DS_CLASS_C_DEC& other) } __catch(...) { - if (a_entries != NULL) + if (a_entries != 0) s_entry_allocator.deallocate(a_entries, actual_size); - if (a_other_entries != NULL) + if (a_other_entries != 0) s_entry_allocator.deallocate(a_other_entries, resize_policy::min_size); __throw_exception_again; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp index 274c93378fd..983df099dd7 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp @@ -53,7 +53,7 @@ copy_from_range(It first_it, It last_it) PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: binomial_heap_base_() : - m_p_max(NULL) + m_p_max(0) { _GLIBCXX_DEBUG_ONLY(assert_valid(false);) } @@ -62,7 +62,7 @@ PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: binomial_heap_base_(const Cmp_Fn& r_cmp_fn) : PB_DS_BASE_C_DEC(r_cmp_fn), - m_p_max(NULL) + m_p_max(0) { _GLIBCXX_DEBUG_ONLY(assert_valid(false);) } @@ -71,7 +71,7 @@ PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: binomial_heap_base_(const PB_DS_CLASS_C_DEC& other) : PB_DS_BASE_C_DEC(other), - m_p_max(NULL) + m_p_max(0) { _GLIBCXX_DEBUG_ONLY(assert_valid(false);) } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp index 9a07f0e7d51..1ccee551402 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp @@ -55,9 +55,9 @@ void PB_DS_CLASS_C_DEC:: assert_max() const { - if (m_p_max == NULL) + if (m_p_max == 0) return; - _GLIBCXX_DEBUG_ASSERT(base_type::parent(m_p_max) == NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::parent(m_p_max) == 0); for (const_iterator it = base_type::begin(); it != base_type::end(); ++it) _GLIBCXX_DEBUG_ASSERT(!Cmp_Fn::operator()(m_p_max->m_value, it.m_p_nd->m_value)); @@ -71,14 +71,14 @@ assert_node_consistent(const_node_pointer p_nd, bool strictly_binomial, { _GLIBCXX_DEBUG_ASSERT(increasing || strictly_binomial); base_type::assert_node_consistent(p_nd, false); - if (p_nd == NULL) + if (p_nd == 0) return; _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata == base_type::degree(p_nd)); _GLIBCXX_DEBUG_ASSERT(base_type::size_under_node(p_nd) == static_cast(1 << p_nd->m_metadata)); assert_node_consistent(p_nd->m_p_next_sibling, strictly_binomial, increasing); assert_node_consistent(p_nd->m_p_l_child, true, false); - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) { if (increasing) { diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp index a4cf90c20f1..d6ead1e51c3 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp @@ -46,10 +46,10 @@ pop() _GLIBCXX_DEBUG_ONLY(assert_valid(true);) _GLIBCXX_DEBUG_ASSERT(!base_type::empty()); - if (m_p_max == NULL) + if (m_p_max == 0) find_max(); - _GLIBCXX_DEBUG_ASSERT(m_p_max != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_max != 0); node_pointer p_nd = m_p_max; @@ -57,7 +57,7 @@ pop() base_type::actual_erase_node(p_nd); - m_p_max = NULL; + m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) } @@ -67,33 +67,33 @@ void PB_DS_CLASS_C_DEC:: remove_parentless_node(node_pointer p_nd) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); - _GLIBCXX_DEBUG_ASSERT(base_type::parent(p_nd) == NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); + _GLIBCXX_DEBUG_ASSERT(base_type::parent(p_nd) == 0); node_pointer p_cur_root = p_nd == base_type::m_p_root? p_nd->m_p_next_sibling : base_type::m_p_root; - if (p_cur_root != NULL) - p_cur_root->m_p_prev_or_parent = NULL; + if (p_cur_root != 0) + p_cur_root->m_p_prev_or_parent = 0; - if (p_nd->m_p_prev_or_parent != NULL) + if (p_nd->m_p_prev_or_parent != 0) p_nd->m_p_prev_or_parent->m_p_next_sibling = p_nd->m_p_next_sibling; - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; node_pointer p_child = p_nd->m_p_l_child; - if (p_child != NULL) + if (p_child != 0) { - p_child->m_p_prev_or_parent = NULL; + p_child->m_p_prev_or_parent = 0; - while (p_child->m_p_next_sibling != NULL) + while (p_child->m_p_next_sibling != 0) p_child = p_child->m_p_next_sibling; } - m_p_max = NULL; + m_p_max = 0; base_type::m_p_root = join(p_cur_root, p_child); } @@ -105,7 +105,7 @@ clear() { base_type::clear(); - m_p_max = NULL; + m_p_max = 0; } PB_DS_CLASS_T_DEC @@ -122,7 +122,7 @@ erase(point_iterator it) base_type::actual_erase_node(it.m_p_nd); - m_p_max = NULL; + m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) } @@ -148,7 +148,7 @@ erase_if(Pred pred) size_type ersd = 0; - while (p_out != NULL) + while (p_out != 0) { ++ersd; @@ -161,19 +161,19 @@ erase_if(Pred pred) node_pointer p_cur = base_type::m_p_root; - base_type::m_p_root = NULL; + base_type::m_p_root = 0; - while (p_cur != NULL) + while (p_cur != 0) { node_pointer p_next = p_cur->m_p_next_sibling; - p_cur->m_p_l_child = p_cur->m_p_prev_or_parent = NULL; + p_cur->m_p_l_child = p_cur->m_p_prev_or_parent = 0; p_cur->m_metadata = 0; p_cur->m_p_next_sibling = base_type::m_p_root; - if (base_type::m_p_root != NULL) + if (base_type::m_p_root != 0) base_type::m_p_root->m_p_prev_or_parent = p_cur; base_type::m_p_root = p_cur; @@ -183,7 +183,7 @@ erase_if(Pred pred) p_cur = p_next; } - m_p_max = NULL; + m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp index ad7f65129ba..3c8ff109def 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp @@ -46,10 +46,10 @@ top() const _GLIBCXX_DEBUG_ONLY(assert_valid(false);) _GLIBCXX_DEBUG_ASSERT(!base_type::empty()); - if (m_p_max == NULL) + if (m_p_max == 0) const_cast(this)->find_max(); - _GLIBCXX_DEBUG_ASSERT(m_p_max != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_max != 0); return m_p_max->m_value; } @@ -62,7 +62,7 @@ find_max() m_p_max = p_cur; - while (p_cur != NULL) + while (p_cur != 0) { if (Cmp_Fn::operator()(m_p_max->m_value, p_cur->m_value)) m_p_max = p_cur; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp index e67d0df148f..735bddbb71a 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp @@ -49,7 +49,7 @@ push(const_reference r_val) insert_node(p_nd); - m_p_max = NULL; + m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) @@ -61,10 +61,10 @@ inline void PB_DS_CLASS_C_DEC:: insert_node(node_pointer p_nd) { - if (base_type::m_p_root == NULL) + if (base_type::m_p_root == 0) { p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = - p_nd->m_p_l_child = NULL; + p_nd->m_p_l_child = 0; p_nd->m_metadata = 0; @@ -75,7 +75,7 @@ insert_node(node_pointer p_nd) if (base_type::m_p_root->m_metadata > 0) { - p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = NULL; + p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = 0; p_nd->m_p_next_sibling = base_type::m_p_root; @@ -92,7 +92,7 @@ insert_node(node_pointer p_nd) { p_nd->m_p_next_sibling = base_type::m_p_root->m_p_next_sibling; - p_nd->m_p_prev_or_parent = NULL; + p_nd->m_p_prev_or_parent = 0; p_nd->m_metadata = 1; @@ -100,15 +100,15 @@ insert_node(node_pointer p_nd) base_type::m_p_root->m_p_prev_or_parent = p_nd; - base_type::m_p_root->m_p_next_sibling = NULL; + base_type::m_p_root->m_p_next_sibling = 0; base_type::m_p_root = p_nd; } else { - p_nd->m_p_next_sibling = NULL; + p_nd->m_p_next_sibling = 0; - p_nd->m_p_l_child = NULL; + p_nd->m_p_l_child = 0; p_nd->m_p_prev_or_parent = base_type::m_p_root; @@ -128,7 +128,7 @@ inline typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: fix(node_pointer p_nd) const { - while (p_nd->m_p_next_sibling != NULL&& + while (p_nd->m_p_next_sibling != 0&& p_nd->m_metadata == p_nd->m_p_next_sibling->m_metadata) { node_pointer p_next = p_nd->m_p_next_sibling; @@ -138,7 +138,7 @@ fix(node_pointer p_nd) const p_next->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; - if (p_nd->m_p_prev_or_parent != NULL) + if (p_nd->m_p_prev_or_parent != 0) p_nd->m_p_prev_or_parent->m_p_next_sibling = p_next; base_type::make_child_of(p_nd, p_next); @@ -151,8 +151,8 @@ fix(node_pointer p_nd) const { p_nd->m_p_next_sibling = p_next->m_p_next_sibling; - if (p_nd->m_p_next_sibling != NULL) - p_next->m_p_next_sibling = NULL; + if (p_nd->m_p_next_sibling != 0) + p_next->m_p_next_sibling = 0; base_type::make_child_of(p_next, p_nd); @@ -160,7 +160,7 @@ fix(node_pointer p_nd) const } } - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd; return p_nd; @@ -174,7 +174,7 @@ modify(point_iterator it, const_reference r_new_val) _GLIBCXX_DEBUG_ONLY(assert_valid(true);) node_pointer p_nd = it.m_p_nd; - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd, false);) const bool bubble_up = Cmp_Fn::operator()(p_nd->m_value, r_new_val); @@ -185,7 +185,7 @@ modify(point_iterator it, const_reference r_new_val) { node_pointer p_parent = base_type::parent(p_nd); - while (p_parent != NULL&& + while (p_parent != 0&& Cmp_Fn::operator()(p_parent->m_value, p_nd->m_value)) { base_type::swap_with_parent(p_nd, p_parent); @@ -193,10 +193,10 @@ modify(point_iterator it, const_reference r_new_val) p_parent = base_type::parent(p_nd); } - if (p_nd->m_p_prev_or_parent == NULL) + if (p_nd->m_p_prev_or_parent == 0) base_type::m_p_root = p_nd; - m_p_max = NULL; + m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) @@ -209,7 +209,7 @@ modify(point_iterator it, const_reference r_new_val) insert_node(p_nd); - m_p_max = NULL; + m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp index a701937cb99..2a96236fb9e 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp @@ -61,7 +61,7 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_out = base_type::prune(pred); - while (p_out != NULL) + while (p_out != 0) { _GLIBCXX_DEBUG_ASSERT(base_type::m_size > 0); --base_type::m_size; @@ -70,13 +70,13 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_next = p_out->m_p_next_sibling; - p_out->m_p_l_child = p_out->m_p_prev_or_parent = NULL; + p_out->m_p_l_child = p_out->m_p_prev_or_parent = 0; p_out->m_metadata = 0; p_out->m_p_next_sibling = other.m_p_root; - if (other.m_p_root != NULL) + if (other.m_p_root != 0) other.m_p_root->m_p_prev_or_parent = p_out; other.m_p_root = p_out; @@ -90,19 +90,19 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_cur = base_type::m_p_root; - base_type::m_p_root = NULL; + base_type::m_p_root = 0; - while (p_cur != NULL) + while (p_cur != 0) { node_pointer p_next = p_cur->m_p_next_sibling; - p_cur->m_p_l_child = p_cur->m_p_prev_or_parent = NULL; + p_cur->m_p_l_child = p_cur->m_p_prev_or_parent = 0; p_cur->m_metadata = 0; p_cur->m_p_next_sibling = base_type::m_p_root; - if (base_type::m_p_root != NULL) + if (base_type::m_p_root != 0) base_type::m_p_root->m_p_prev_or_parent = p_cur; base_type::m_p_root = p_cur; @@ -112,7 +112,7 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) p_cur = p_next; } - m_p_max = NULL; + m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) _GLIBCXX_DEBUG_ONLY(other.assert_valid(true);) @@ -128,7 +128,7 @@ join(PB_DS_CLASS_C_DEC& other) node_pointer p_other = other.m_p_root; - if (p_other != NULL) + if (p_other != 0) do { node_pointer p_next = p_other->m_p_next_sibling; @@ -137,15 +137,15 @@ join(PB_DS_CLASS_C_DEC& other) p_other = p_next; } - while (p_other != NULL); + while (p_other != 0); base_type::m_p_root = join(base_type::m_p_root, other.m_p_root); base_type::m_size += other.m_size; - m_p_max = NULL; + m_p_max = 0; - other.m_p_root = NULL; + other.m_p_root = 0; other.m_size = 0; - other.m_p_max = NULL; + other.m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid(true);) _GLIBCXX_DEBUG_ONLY(other.assert_valid(true);) @@ -156,15 +156,15 @@ inline typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: join(node_pointer p_lhs, node_pointer p_rhs) const { - node_pointer p_ret = NULL; + node_pointer p_ret = 0; - node_pointer p_cur = NULL; + node_pointer p_cur = 0; - while (p_lhs != NULL || p_rhs != NULL) + while (p_lhs != 0 || p_rhs != 0) { - if (p_rhs == NULL) + if (p_rhs == 0) { - if (p_cur == NULL) + if (p_cur == 0) p_ret = p_cur = p_lhs; else { @@ -173,11 +173,11 @@ join(node_pointer p_lhs, node_pointer p_rhs) const p_lhs->m_p_prev_or_parent = p_cur; } - p_cur = p_lhs = NULL; + p_cur = p_lhs = 0; } - else if (p_lhs == NULL || p_rhs->m_metadata < p_lhs->m_metadata) + else if (p_lhs == 0 || p_rhs->m_metadata < p_lhs->m_metadata) { - if (p_cur == NULL) + if (p_cur == 0) { p_ret = p_cur = p_rhs; @@ -196,7 +196,7 @@ join(node_pointer p_lhs, node_pointer p_rhs) const } else if (p_lhs->m_metadata < p_rhs->m_metadata) { - if (p_cur == NULL) + if (p_cur == 0) p_ret = p_cur = p_lhs; else { @@ -221,11 +221,11 @@ join(node_pointer p_lhs, node_pointer p_rhs) const } } - if (p_cur != NULL) - p_cur->m_p_next_sibling = NULL; + if (p_cur != 0) + p_cur->m_p_next_sibling = 0; - if (p_ret != NULL) - p_ret->m_p_prev_or_parent = NULL; + if (p_ret != 0) + p_ret->m_p_prev_or_parent = 0; return p_ret; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp index f5efabe0840..2bace9c5ebd 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp @@ -374,7 +374,7 @@ namespace __gnu_pbds entry_pointer p_e = m_entries[pos]; resize_base::notify_insert_search_start(); - while (p_e != NULL + while (p_e != 0 && !hash_eq_fn_base::operator()(p_e->m_value.first, r_key)) { resize_base::notify_insert_search_collision(); @@ -382,7 +382,7 @@ namespace __gnu_pbds } resize_base::notify_insert_search_end(); - if (p_e != NULL) + if (p_e != 0) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(r_key);) return (p_e->m_value.second); @@ -399,7 +399,7 @@ namespace __gnu_pbds comp_hash pos_hash_pair = ranged_hash_fn_base::operator()(r_key); entry_pointer p_e = m_entries[pos_hash_pair.first]; resize_base::notify_insert_search_start(); - while (p_e != NULL && + while (p_e != 0 && !hash_eq_fn_base::operator()(p_e->m_value.first, p_e->m_hash, r_key, pos_hash_pair.second)) { resize_base::notify_insert_search_collision(); @@ -407,7 +407,7 @@ namespace __gnu_pbds } resize_base::notify_insert_search_end(); - if (p_e != NULL) + if (p_e != 0) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(r_key);) return p_e->m_value.second; @@ -468,7 +468,7 @@ namespace __gnu_pbds { entry_pointer p_e = m_entries[ranged_hash_fn_base::operator()(r_key)]; resize_base::notify_find_search_start(); - while (p_e != NULL && + while (p_e != 0 && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), r_key)) { resize_base::notify_find_search_collision(); @@ -478,7 +478,7 @@ namespace __gnu_pbds resize_base::notify_find_search_end(); #ifdef _GLIBCXX_DEBUG - if (p_e == NULL) + if (p_e == 0) debug_base::check_key_does_not_exist(r_key); else debug_base::check_key_exists(r_key); @@ -492,7 +492,7 @@ namespace __gnu_pbds comp_hash pos_hash_pair = ranged_hash_fn_base::operator()(r_key); entry_pointer p_e = m_entries[pos_hash_pair.first]; resize_base::notify_find_search_start(); - while (p_e != NULL && + while (p_e != 0 && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), p_e->m_hash, r_key, pos_hash_pair.second)) @@ -504,7 +504,7 @@ namespace __gnu_pbds resize_base::notify_find_search_end(); #ifdef _GLIBCXX_DEBUG - if (p_e == NULL) + if (p_e == 0) debug_base::check_key_does_not_exist(r_key); else debug_base::check_key_exists(r_key); @@ -534,22 +534,22 @@ namespace __gnu_pbds inc_it_state(const_pointer& r_p_value, std::pair& r_pos) const { - _GLIBCXX_DEBUG_ASSERT(r_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(r_p_value != 0); r_pos.first = r_pos.first->m_p_next; - if (r_pos.first != NULL) + if (r_pos.first != 0) { r_p_value = &r_pos.first->m_value; return; } for (++r_pos.second; r_pos.second < m_num_e; ++r_pos.second) - if (m_entries[r_pos.second] != NULL) + if (m_entries[r_pos.second] != 0) { r_pos.first = m_entries[r_pos.second]; r_p_value = &r_pos.first->m_value; return; } - r_p_value = NULL; + r_p_value = 0; } void @@ -557,13 +557,13 @@ namespace __gnu_pbds std::pair& r_pos) const { for (r_pos.second = 0; r_pos.second < m_num_e; ++r_pos.second) - if (m_entries[r_pos.second] != NULL) + if (m_entries[r_pos.second] != 0) { r_pos.first = m_entries[r_pos.second]; r_p_value = &r_pos.first->m_value; return; } - r_p_value = NULL; + r_p_value = 0; } #ifdef _GLIBCXX_DEBUG diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp index 1a61893d105..c5268447232 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp @@ -64,7 +64,7 @@ cmp_with_other(const Other_Map_Type& other) const const_cast(*this). find_key_pointer(r_key, traits_base::m_store_extra_indicator); - if (p_mapped_value == NULL) + if (p_mapped_value == 0) return false; #ifdef PB_DS_DATA_TRUE_INDICATOR diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp index 24294ad9135..f67254169b7 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp @@ -87,7 +87,7 @@ PB_DS_CLASS_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn) : m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0), m_entries(s_entry_pointer_allocator.allocate(m_num_e)) { - std::fill(m_entries, m_entries + m_num_e, (entry_pointer)NULL); + std::fill(m_entries, m_entries + m_num_e, (entry_pointer)0); Resize_Policy::notify_cleared(); ranged_hash_fn_base::notify_resized(m_num_e); _GLIBCXX_DEBUG_ONLY(PB_DS_CLASS_C_DEC::assert_valid();) @@ -184,7 +184,7 @@ void PB_DS_CLASS_C_DEC:: initialize() { - std::fill(m_entries, m_entries + m_num_e, entry_pointer(NULL)); + std::fill(m_entries, m_entries + m_num_e, entry_pointer(0)); Resize_Policy::notify_resized(m_num_e); Resize_Policy::notify_cleared(); ranged_hash_fn_base::notify_resized(m_num_e); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp index 4219eef3885..81d68e3311e 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp @@ -58,7 +58,7 @@ assert_entry_pointer_array_valid(const entry_pointer_array a_p_entries) const for (size_type pos = 0; pos < m_num_e; ++pos) { entry_pointer p_e = a_p_entries[pos]; - while (p_e != NULL) + while (p_e != 0) { ++iterated_num_used_e; assert_entry_pointer_valid(p_e, traits_base::m_store_extra_indicator); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp index fa09f734843..912535f9390 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp @@ -43,7 +43,7 @@ void PB_DS_CLASS_C_DEC:: deallocate_links_in_list(entry_pointer p_e) { - while (p_e != NULL) + while (p_e != 0) { entry_pointer p_dealloc_e = p_e; p_e = p_e->m_p_next; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp index 9f9178bc911..e1260c0d9bd 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp @@ -61,7 +61,7 @@ erase_if(Pred pred) size_type num_ersd = 0; for (size_type pos = 0; pos < m_num_e; ++pos) { - while (m_entries[pos] != NULL && pred(m_entries[pos]->m_value)) + while (m_entries[pos] != 0 && pred(m_entries[pos]->m_value)) { ++num_ersd; entry_pointer p_next_e = m_entries[pos]->m_p_next; @@ -70,7 +70,7 @@ erase_if(Pred pred) } entry_pointer p_e = m_entries[pos]; - while (p_e != NULL && p_e->m_p_next != NULL) + while (p_e != 0 && p_e->m_p_next != 0) { if (pred(p_e->m_p_next->m_value)) { @@ -92,7 +92,7 @@ PB_DS_CLASS_C_DEC:: clear() { for (size_type pos = 0; pos < m_num_e; ++pos) - while (m_entries[pos] != NULL) + while (m_entries[pos] != 0) erase_entry_pointer(m_entries[pos]); do_resize_if_needed_no_throw(); resize_base::notify_cleared(); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp index d24fc31f9dc..1f8fa06bda3 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp @@ -56,7 +56,7 @@ erase_in_pos_imp(const_key_reference r_key, size_type pos) _GLIBCXX_DEBUG_ONLY(assert_valid();) entry_pointer p_e = m_entries[pos]; resize_base::notify_erase_search_start(); - if (p_e == NULL) + if (p_e == 0) { resize_base::notify_erase_search_end(); _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(r_key);) @@ -77,7 +77,7 @@ erase_in_pos_imp(const_key_reference r_key, size_type pos) while (true) { entry_pointer p_next_e = p_e->m_p_next; - if (p_next_e == NULL) + if (p_next_e == 0) { resize_base::notify_erase_search_end(); _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(r_key);) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp index d72df696221..01192b4cefd 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp @@ -47,7 +47,7 @@ erase_in_pos_imp(const_key_reference r_key, const comp_hash& r_pos_hash_pair) _GLIBCXX_DEBUG_ONLY(assert_valid();) entry_pointer p_e = m_entries[r_pos_hash_pair.first]; resize_base::notify_erase_search_start(); - if (p_e == NULL) + if (p_e == 0) { resize_base::notify_erase_search_end(); _GLIBCXX_DEBUG_ONLY(debug_base:: check_key_does_not_exist(r_key);) @@ -69,7 +69,7 @@ erase_in_pos_imp(const_key_reference r_key, const comp_hash& r_pos_hash_pair) while (true) { entry_pointer p_next_e = p_e->m_p_next; - if (p_next_e == NULL) + if (p_next_e == 0) { resize_base::notify_erase_search_end(); _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(r_key);) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp index 6ca9a03b4fa..03db9f84f28 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp @@ -61,11 +61,11 @@ PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::point_iterator PB_DS_CLASS_C_DEC:: find_end() -{ return NULL; } +{ return 0; } PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::const_point_iterator PB_DS_CLASS_C_DEC:: find_end() const -{ return NULL; } +{ return 0; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp index dc1519df7b3..5722c775def 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp @@ -81,7 +81,7 @@ cmp_with_other(const Other_Map_Type& other) const const_cast(*this). find_key_pointer(r_key, traits_base::m_store_extra_indicator); - if (p_mapped_value == NULL) + if (p_mapped_value == 0) return false; #ifdef PB_DS_DATA_TRUE_INDICATOR diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp index 7215ccd86bc..3d23eab5c35 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp @@ -50,7 +50,7 @@ insert_imp(const_reference r_val, false_type) entry_pointer p_e = m_entries[pos]; resize_base::notify_insert_search_start(); - while (p_e != NULL && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), + while (p_e != 0 && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), r_key)) { resize_base::notify_insert_search_collision(); @@ -58,7 +58,7 @@ insert_imp(const_reference r_val, false_type) } resize_base::notify_insert_search_end(); - if (p_e != NULL) + if (p_e != 0) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(r_key);) return std::make_pair(&p_e->m_value, false); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp index fbc284f80b9..b35570690af 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp @@ -50,7 +50,7 @@ insert_imp(const_reference r_val, true_type) entry_pointer p_e = m_entries[pos_hash_pair.first]; resize_base::notify_insert_search_start(); - while (p_e != NULL && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), + while (p_e != 0 && !hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), p_e->m_hash, key, pos_hash_pair.second)) { @@ -59,7 +59,7 @@ insert_imp(const_reference r_val, true_type) } resize_base::notify_insert_search_end(); - if (p_e != NULL) + if (p_e != 0) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(key);) return std::make_pair(&p_e->m_value, false); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp index 66333ec85c2..11e2583bc47 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp @@ -112,12 +112,12 @@ PB_DS_CLASS_C_DEC:: resize_imp_no_exceptions(size_type new_size, entry_pointer_array a_p_entries_resized, size_type old_size) { std::fill(a_p_entries_resized, a_p_entries_resized + m_num_e, - entry_pointer(NULL)); + entry_pointer(0)); for (size_type pos = 0; pos < old_size; ++pos) { entry_pointer p_e = m_entries[pos]; - while (p_e != NULL) + while (p_e != 0) p_e = resize_imp_no_exceptions_reassign_pointer(p_e, a_p_entries_resized, traits_base::m_store_extra_indicator); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp index 6fa5676b9df..77735aeafdd 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp @@ -62,7 +62,7 @@ PB_DS_CLASS_C_DEC:: trace_list(const_entry_pointer p_l) const { size_type iterated_num_used_e = 0; - while (p_l != NULL) + while (p_l != 0) { std::cerr << PB_DS_V2F(p_l->m_value) << " "; p_l = p_l->m_p_next; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp index 69d53763ad5..d39735c5632 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp @@ -60,11 +60,11 @@ PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::point_iterator PB_DS_CLASS_C_DEC:: find_end() -{ return NULL; } +{ return 0; } PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::const_point_iterator PB_DS_CLASS_C_DEC:: find_end() const -{ return NULL; } +{ return 0; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp index 4741afec090..5b2df85a8c2 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp @@ -490,7 +490,7 @@ namespace __gnu_pbds resize_base::notify_find_search_end(); _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);) - return NULL; + return 0; } break; case valid_entry_status: @@ -513,7 +513,7 @@ namespace __gnu_pbds _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);) resize_base::notify_find_search_end(); - return NULL; + return 0; } inline pointer @@ -538,7 +538,7 @@ namespace __gnu_pbds resize_base::notify_find_search_end(); _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);) - return NULL; + return 0; } break; case valid_entry_status: @@ -562,7 +562,7 @@ namespace __gnu_pbds _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(key);) resize_base::notify_find_search_end(); - return NULL; + return 0; } inline bool @@ -583,7 +583,7 @@ namespace __gnu_pbds void inc_it_state(const_pointer& r_p_value, size_type& r_pos) const { - _GLIBCXX_DEBUG_ASSERT(r_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(r_p_value != 0); for (++r_pos; r_pos < m_num_e; ++r_pos) { const_entry_pointer p_e =& m_entries[r_pos]; @@ -593,7 +593,7 @@ namespace __gnu_pbds return; } } - r_p_value = NULL; + r_p_value = 0; } void @@ -608,7 +608,7 @@ namespace __gnu_pbds return; } } - r_p_value = NULL; + r_p_value = 0; } void @@ -623,7 +623,7 @@ namespace __gnu_pbds return; } } - r_p_value = NULL; + r_p_value = 0; } #ifdef _GLIBCXX_DEBUG diff --git a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp index 0492a47928b..115a8bf0dda 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp @@ -87,7 +87,7 @@ resize_imp(size_type new_size) _GLIBCXX_DEBUG_ONLY(assert_valid();) const size_type old_size = m_num_e; - entry_array a_entries_resized = NULL; + entry_array a_entries_resized = 0; // Following line might throw an exception. a_entries_resized = s_entry_allocator.allocate(new_size); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp index 479725fd51b..dac063927f6 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -60,7 +60,7 @@ namespace __gnu_pbds typedef typename __conditional_type< is_same< - __gnu_pbds::direct_mask_range_hashing, + __gnu_pbds::direct_mask_range_hashing, Comb_Probe_Fn>::value, __gnu_pbds::linear_probe_fn, __gnu_pbds::quadratic_probe_fn >::__type diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp index dad6451d06f..7dcd82588c1 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -48,7 +48,7 @@ class sample_probe_fn public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; public: diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp index 0912e7f27e8..988f111ea20 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -48,7 +48,7 @@ class sample_range_hashing public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; public: diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp index 6120231e2e2..8fa04d140e5 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -48,7 +48,7 @@ class sample_ranged_hash_fn public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; public: diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp index 915f108df83..2bcfdf51a54 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -48,7 +48,7 @@ class sample_ranged_probe_fn public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; public: @@ -70,7 +70,7 @@ protected: // Transforms the const key reference r_key into the i-th position within the table. This method is called for each collision within the probe sequence. inline size_type - operator()(const_key_reference r_key, size_t hash, size_type i) const; + operator()(const_key_reference r_key, std::size_t hash, size_type i) const; }; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp index 5955df16164..4c085d4c69d 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp @@ -118,7 +118,7 @@ namespace __gnu_pbds inline PB_DS_CLASS_C_DEC& operator++() { - _GLIBCXX_DEBUG_ASSERT(base_type::m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::m_p_nd != 0); inc(); return (*this); } @@ -135,10 +135,10 @@ namespace __gnu_pbds void inc() { - if (base_type::m_p_nd->m_p_next_sibling != NULL) + if (base_type::m_p_nd->m_p_next_sibling != 0) { base_type::m_p_nd = base_type::m_p_nd->m_p_next_sibling; - while (base_type::m_p_nd->m_p_l_child != NULL) + while (base_type::m_p_nd->m_p_l_child != 0) base_type::m_p_nd = base_type::m_p_nd->m_p_l_child; return; } @@ -147,7 +147,7 @@ namespace __gnu_pbds { node_pointer p_next = base_type::m_p_nd; base_type::m_p_nd = base_type::m_p_nd->m_p_prev_or_parent; - if (base_type::m_p_nd == NULL || base_type::m_p_nd->m_p_l_child == p_next) + if (base_type::m_p_nd == 0 || base_type::m_p_nd->m_p_l_child == p_next) return; } } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp index 7d682526b4c..8eb1574446b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp @@ -107,7 +107,7 @@ namespace __gnu_pbds // Default constructor. inline - left_child_next_sibling_heap_node_const_point_iterator_() : m_p_nd(NULL) + left_child_next_sibling_heap_node_const_point_iterator_() : m_p_nd(0) { } // Copy constructor. @@ -119,7 +119,7 @@ namespace __gnu_pbds inline const_pointer operator->() const { - _GLIBCXX_DEBUG_ASSERT(m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_nd != 0); return &m_p_nd->m_value; } @@ -127,7 +127,7 @@ namespace __gnu_pbds inline const_reference operator*() const { - _GLIBCXX_DEBUG_ASSERT(m_p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_nd != 0); return m_p_nd->m_value; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp index ea0572527c2..536ac66ea4b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp @@ -49,7 +49,7 @@ PB_DS_CLASS_C_DEC::s_no_throw_copies_ind; PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: left_child_next_sibling_heap_() : - m_p_root(NULL), + m_p_root(0), m_size(0) { _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -59,7 +59,7 @@ PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: left_child_next_sibling_heap_(const Cmp_Fn& r_cmp_fn) : Cmp_Fn(r_cmp_fn), - m_p_root(NULL), + m_p_root(0), m_size(0) { _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -68,7 +68,7 @@ left_child_next_sibling_heap_(const Cmp_Fn& r_cmp_fn) : PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: left_child_next_sibling_heap_(const PB_DS_CLASS_C_DEC& other) -: Cmp_Fn(other), m_p_root(NULL), m_size(0) +: Cmp_Fn(other), m_p_root(0), m_size(0) { m_size = other.m_size; _GLIBCXX_DEBUG_ONLY(other.assert_valid();) @@ -111,8 +111,8 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: recursive_copy_node(const_node_pointer p_nd) { - if (p_nd == NULL) - return (NULL); + if (p_nd == 0) + return (0); node_pointer p_ret = s_node_allocator.allocate(1); @@ -127,7 +127,7 @@ recursive_copy_node(const_node_pointer p_nd) } p_ret->m_p_l_child = p_ret->m_p_next_sibling = - p_ret->m_p_prev_or_parent = NULL; + p_ret->m_p_prev_or_parent = 0; __try { @@ -140,12 +140,12 @@ recursive_copy_node(const_node_pointer p_nd) __throw_exception_again; } - if (p_ret->m_p_l_child != NULL) + if (p_ret->m_p_l_child != 0) p_ret->m_p_l_child->m_p_prev_or_parent = p_ret; - if (p_ret->m_p_next_sibling != NULL) + if (p_ret->m_p_next_sibling != 0) p_ret->m_p_next_sibling->m_p_prev_or_parent = - p_nd->m_p_next_sibling->m_p_prev_or_parent == p_nd ? p_ret : NULL; + p_nd->m_p_next_sibling->m_p_prev_or_parent == p_nd ? p_ret : 0; return p_ret; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp index 86871ac3817..16b8217bd61 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp @@ -45,9 +45,9 @@ void PB_DS_CLASS_C_DEC:: assert_valid() const { - _GLIBCXX_DEBUG_ASSERT(m_p_root == NULL || m_p_root->m_p_prev_or_parent == NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_root == 0 || m_p_root->m_p_prev_or_parent == 0); - if (m_p_root != NULL) + if (m_p_root != 0) assert_node_consistent(m_p_root, Single_Link_Roots); assert_size(); assert_iterators(); @@ -58,22 +58,22 @@ void PB_DS_CLASS_C_DEC:: assert_node_consistent(const_node_pointer p_nd, bool single_link) const { - if (p_nd == NULL) + if (p_nd == 0) return; assert_node_consistent(p_nd->m_p_l_child, false); assert_node_consistent(p_nd->m_p_next_sibling, single_link); if (single_link) - _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_prev_or_parent == NULL); - else if (p_nd->m_p_next_sibling != NULL) + _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_prev_or_parent == 0); + else if (p_nd->m_p_next_sibling != 0) _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling->m_p_prev_or_parent == p_nd); - if (p_nd->m_p_l_child == NULL) + if (p_nd->m_p_l_child == 0) return; const_node_pointer p_child = p_nd->m_p_l_child; - while (p_child != NULL) + while (p_child != 0) { const_node_pointer p_next_child = p_child->m_p_next_sibling; _GLIBCXX_DEBUG_ASSERT(!Cmp_Fn::operator()(p_nd->m_value, p_child->m_value)); @@ -115,7 +115,7 @@ PB_DS_CLASS_C_DEC:: size_from_node(const_node_pointer p_nd) { size_type ret = 0; - while (p_nd != NULL) + while (p_nd != 0) { ret += 1 + size_from_node(p_nd->m_p_l_child); p_nd = p_nd->m_p_next_sibling; @@ -130,7 +130,7 @@ degree(const_node_pointer p_nd) { size_type ret = 0; const_node_pointer p_child = p_nd->m_p_l_child; - while (p_child != NULL) + while (p_child != 0) { ++ret; p_child = p_child->m_p_next_sibling; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp index 9fa09f49bbb..605457fd4cb 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp @@ -45,7 +45,7 @@ clear() { clear_imp(m_p_root); _GLIBCXX_DEBUG_ASSERT(m_size == 0); - m_p_root = NULL; + m_p_root = 0; } PB_DS_CLASS_T_DEC @@ -64,7 +64,7 @@ void PB_DS_CLASS_C_DEC:: clear_imp(node_pointer p_nd) { - while (p_nd != NULL) + while (p_nd != 0) { clear_imp(p_nd->m_p_l_child); node_pointer p_next = p_nd->m_p_next_sibling; @@ -80,8 +80,8 @@ to_linked_list() { _GLIBCXX_DEBUG_ONLY(assert_valid();) node_pointer p_cur = m_p_root; - while (p_cur != NULL) - if (p_cur->m_p_l_child != NULL) + while (p_cur != 0) + if (p_cur->m_p_l_child != 0) { node_pointer p_child_next = p_cur->m_p_l_child->m_p_next_sibling; p_cur->m_p_l_child->m_p_next_sibling = p_cur->m_p_next_sibling; @@ -94,10 +94,10 @@ to_linked_list() #ifdef _GLIBCXX_DEBUG const_node_pointer p_counter = m_p_root; size_type count = 0; - while (p_counter != NULL) + while (p_counter != 0) { ++count; - _GLIBCXX_DEBUG_ASSERT(p_counter->m_p_l_child == NULL); + _GLIBCXX_DEBUG_ASSERT(p_counter->m_p_l_child == 0); p_counter = p_counter->m_p_next_sibling; } _GLIBCXX_DEBUG_ASSERT(count == m_size); @@ -111,22 +111,22 @@ PB_DS_CLASS_C_DEC:: prune(Pred pred) { node_pointer p_cur = m_p_root; - m_p_root = NULL; - node_pointer p_out = NULL; - while (p_cur != NULL) + m_p_root = 0; + node_pointer p_out = 0; + while (p_cur != 0) { node_pointer p_next = p_cur->m_p_next_sibling; if (pred(p_cur->m_value)) { p_cur->m_p_next_sibling = p_out; - if (p_out != NULL) + if (p_out != 0) p_out->m_p_prev_or_parent = p_cur; p_out = p_cur; } else { p_cur->m_p_next_sibling = m_p_root; - if (m_p_root != NULL) + if (m_p_root != 0) m_p_root->m_p_prev_or_parent = p_cur; m_p_root = p_cur; } @@ -141,7 +141,7 @@ PB_DS_CLASS_C_DEC:: bubble_to_top(node_pointer p_nd) { node_pointer p_parent = parent(p_nd); - while (p_parent != NULL) + while (p_parent != 0) { swap_with_parent(p_nd, p_parent); p_parent = parent(p_nd); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp index 926ccd39c22..478abe018b0 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp @@ -87,12 +87,12 @@ inline void PB_DS_CLASS_C_DEC:: make_child_of(node_pointer p_nd, node_pointer p_new_parent) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); - _GLIBCXX_DEBUG_ASSERT(p_new_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); + _GLIBCXX_DEBUG_ASSERT(p_new_parent != 0); p_nd->m_p_next_sibling = p_new_parent->m_p_l_child; - if (p_new_parent->m_p_l_child != NULL) + if (p_new_parent->m_p_l_child != 0) p_new_parent->m_p_l_child->m_p_prev_or_parent = p_nd; p_nd->m_p_prev_or_parent = p_new_parent; @@ -109,7 +109,7 @@ parent(node_pointer p_nd) { node_pointer p_pot = p_nd->m_p_prev_or_parent; - if (p_pot == NULL || p_pot->m_p_l_child == p_nd) + if (p_pot == 0 || p_pot->m_p_l_child == p_nd) return p_pot; p_nd = p_pot; @@ -124,12 +124,12 @@ swap_with_parent(node_pointer p_nd, node_pointer p_parent) if (p_parent == m_p_root) m_p_root = p_nd; - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); - _GLIBCXX_DEBUG_ASSERT(p_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); + _GLIBCXX_DEBUG_ASSERT(p_parent != 0); _GLIBCXX_DEBUG_ASSERT(parent(p_nd) == p_parent); const bool nd_direct_child = p_parent->m_p_l_child == p_nd; - const bool parent_root = p_parent->m_p_prev_or_parent == NULL; + const bool parent_root = p_parent->m_p_prev_or_parent == 0; const bool parent_direct_child = !parent_root&& p_parent->m_p_prev_or_parent->m_p_l_child == p_parent; @@ -138,16 +138,16 @@ swap_with_parent(node_pointer p_nd, node_pointer p_parent) std::swap(p_parent->m_p_l_child, p_nd->m_p_l_child); std::swap(p_parent->m_metadata, p_nd->m_metadata); - _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_l_child != NULL); - _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_prev_or_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_l_child != 0); + _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_prev_or_parent != 0); - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd; - if (p_parent->m_p_next_sibling != NULL) + if (p_parent->m_p_next_sibling != 0) p_parent->m_p_next_sibling->m_p_prev_or_parent = p_parent; - if (p_parent->m_p_l_child != NULL) + if (p_parent->m_p_l_child != 0) p_parent->m_p_l_child->m_p_prev_or_parent = p_parent; if (parent_direct_child) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp index dca70fdd509..b6587e229f2 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp @@ -45,10 +45,10 @@ begin() { node_pointer p_nd = m_p_root; - if (p_nd == NULL) - return (iterator(NULL)); + if (p_nd == 0) + return (iterator(0)); - while (p_nd->m_p_l_child != NULL) + while (p_nd->m_p_l_child != 0) p_nd = p_nd->m_p_l_child; return (iterator(p_nd)); @@ -61,10 +61,10 @@ begin() const { node_pointer p_nd = m_p_root; - if (p_nd == NULL) - return (const_iterator(NULL)); + if (p_nd == 0) + return (const_iterator(0)); - while (p_nd->m_p_l_child != NULL) + while (p_nd->m_p_l_child != 0) p_nd = p_nd->m_p_l_child; return (const_iterator(p_nd)); @@ -75,7 +75,7 @@ inline typename PB_DS_CLASS_C_DEC::iterator PB_DS_CLASS_C_DEC:: end() { - return (iterator(NULL)); + return (iterator(0)); } PB_DS_CLASS_T_DEC @@ -83,6 +83,6 @@ inline typename PB_DS_CLASS_C_DEC::const_iterator PB_DS_CLASS_C_DEC:: end() const { - return (const_iterator(NULL)); + return (const_iterator(0)); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp index 040466e8e84..7ba4bf6ee8b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp @@ -38,8 +38,8 @@ * Contains an implementation struct for this type of heap's node. */ -#ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NULL_METADATA_HPP -#define PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NULL_METADATA_HPP +#ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_0_METADATA_HPP +#define PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_0_METADATA_HPP namespace __gnu_pbds { @@ -52,4 +52,4 @@ namespace __gnu_pbds } // namespace detail } // namespace __gnu_pbds -#endif // #ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NULL_METADATA_HPP +#endif // #ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_0_METADATA_HPP diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp index 2b90cfa1dc0..8d33baa10ac 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp @@ -57,7 +57,7 @@ void PB_DS_CLASS_C_DEC:: trace_node(const_node_pointer p_nd, size_type level) { - while (p_nd != NULL) + while (p_nd != 0) { for (size_type i = 0; i < level; ++i) std::cerr << ' '; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp index c998c3e67c1..662f40f34e8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp @@ -67,13 +67,13 @@ copy_from_range(It first_it, It last_it) PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: -PB_DS_CLASS_NAME() : m_p_l(NULL) +PB_DS_CLASS_NAME() : m_p_l(0) { _GLIBCXX_DEBUG_ONLY(assert_valid();) } PB_DS_CLASS_T_DEC template PB_DS_CLASS_C_DEC:: -PB_DS_CLASS_NAME(It first_it, It last_it) : m_p_l(NULL) +PB_DS_CLASS_NAME(It first_it, It last_it) : m_p_l(0) { copy_from_range(first_it, last_it); _GLIBCXX_DEBUG_ONLY(assert_valid();); @@ -85,7 +85,7 @@ PB_DS_CLASS_NAME(const PB_DS_CLASS_C_DEC& other) : #ifdef _GLIBCXX_DEBUG debug_base(), #endif -m_p_l(NULL) +m_p_l(0) { __try { @@ -125,13 +125,13 @@ PB_DS_CLASS_C_DEC:: deallocate_all() { entry_pointer p_l = m_p_l; - while (p_l != NULL) + while (p_l != 0) { entry_pointer p_next_l = p_l->m_p_next; actual_erase_entry(p_l); p_l = p_next_l; } - m_p_l = NULL; + m_p_l = 0; } PB_DS_CLASS_T_DEC diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp index cdc59208fa3..a7d0fbadf89 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp @@ -44,7 +44,7 @@ PB_DS_CLASS_C_DEC:: erase(const_key_reference r_key) { _GLIBCXX_DEBUG_ONLY(PB_DS_CLASS_C_DEC::assert_valid();) - if (m_p_l == NULL) + if (m_p_l == 0) return false; if (s_eq_fn(r_key, PB_DS_V2F(m_p_l->m_value))) @@ -56,7 +56,7 @@ erase(const_key_reference r_key) } entry_pointer p_l = m_p_l; - while (p_l->m_p_next != NULL) + while (p_l->m_p_next != 0) if (s_eq_fn(r_key, PB_DS_V2F(p_l->m_p_next->m_value))) { erase_next(p_l); @@ -83,7 +83,7 @@ erase_if(Pred pred) { _GLIBCXX_DEBUG_ONLY(PB_DS_CLASS_C_DEC::assert_valid();) size_type num_ersd = 0; - while (m_p_l != NULL && pred(m_p_l->m_value)) + while (m_p_l != 0 && pred(m_p_l->m_value)) { entry_pointer p_next = m_p_l->m_p_next; ++num_ersd; @@ -91,11 +91,11 @@ erase_if(Pred pred) m_p_l = p_next; } - if (m_p_l == NULL) + if (m_p_l == 0) return num_ersd; entry_pointer p_l = m_p_l; - while (p_l->m_p_next != NULL) + while (p_l->m_p_next != 0) { if (pred(p_l->m_p_next->m_value)) { @@ -115,9 +115,9 @@ void PB_DS_CLASS_C_DEC:: erase_next(entry_pointer p_l) { - _GLIBCXX_DEBUG_ASSERT(p_l != NULL); + _GLIBCXX_DEBUG_ASSERT(p_l != 0); _GLIBCXX_DEBUG_ASSERT(p_l != m_p_l); - _GLIBCXX_DEBUG_ASSERT(p_l->m_p_next != NULL); + _GLIBCXX_DEBUG_ASSERT(p_l->m_p_next != 0); entry_pointer p_next_l = p_l->m_p_next->m_p_next; actual_erase_entry(p_l->m_p_next); p_l->m_p_next = p_next_l; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp index 50347ac5fca..e7f5ed1d3f8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp @@ -43,8 +43,8 @@ inline typename PB_DS_CLASS_C_DEC::entry_pointer PB_DS_CLASS_C_DEC:: find_imp(const_key_reference r_key) const { - if (m_p_l == NULL) - return NULL; + if (m_p_l == 0) + return 0; if (s_eq_fn(r_key, PB_DS_V2F(m_p_l->m_value))) { apply_update(m_p_l, s_metadata_type_indicator); @@ -53,7 +53,7 @@ find_imp(const_key_reference r_key) const } entry_pointer p_l = m_p_l; - while (p_l->m_p_next != NULL) + while (p_l->m_p_next != 0) { entry_pointer p_next = p_l->m_p_next; if (s_eq_fn(r_key, PB_DS_V2F(p_next->m_value))) @@ -72,7 +72,7 @@ find_imp(const_key_reference r_key) const } _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(r_key);) - return NULL; + return 0; } PB_DS_CLASS_T_DEC diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp index 5ad39709d5d..1aaaf1edd92 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp @@ -54,4 +54,4 @@ PB_DS_CLASS_T_DEC inline bool PB_DS_CLASS_C_DEC:: empty() const -{ return (m_p_l == NULL); } +{ return (m_p_l == 0); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp index 5efe2a13a66..197cfbc6d18 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp @@ -48,7 +48,7 @@ insert(const_reference r_val) _GLIBCXX_DEBUG_ONLY(assert_valid();) entry_pointer p_l = find_imp(PB_DS_V2F(r_val)); - if (p_l != NULL) + if (p_l != 0) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(PB_DS_V2F(r_val));) return std::make_pair(point_iterator(&p_l->m_value), false); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp index e3247c5b080..4d4e0b417c2 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp @@ -43,7 +43,7 @@ inline typename PB_DS_CLASS_C_DEC::iterator PB_DS_CLASS_C_DEC:: begin() { - if (m_p_l == NULL) + if (m_p_l == 0) { _GLIBCXX_DEBUG_ASSERT(empty()); return end(); @@ -56,7 +56,7 @@ inline typename PB_DS_CLASS_C_DEC::const_iterator PB_DS_CLASS_C_DEC:: begin() const { - if (m_p_l == NULL) + if (m_p_l == 0) { _GLIBCXX_DEBUG_ASSERT(empty()); return end(); @@ -68,13 +68,13 @@ PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::iterator PB_DS_CLASS_C_DEC:: end() -{ return iterator(NULL, NULL, this); } +{ return iterator(0, 0, this); } PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::const_iterator PB_DS_CLASS_C_DEC:: end() const { - return const_iterator(NULL, NULL, const_cast(this)); + return const_iterator(0, 0, const_cast(this)); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp index 0e9336b57ca..cf43064e504 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp @@ -233,7 +233,7 @@ namespace __gnu_pbds { _GLIBCXX_DEBUG_ONLY(assert_valid();) entry_pointer p_e = find_imp(r_key); - return point_iterator(p_e == NULL ? NULL: &p_e->m_value); + return point_iterator(p_e == 0 ? 0: &p_e->m_value); } inline const_point_iterator @@ -241,7 +241,7 @@ namespace __gnu_pbds { _GLIBCXX_DEBUG_ONLY(assert_valid();) entry_pointer p_e = find_imp(r_key); - return const_point_iterator(p_e == NULL ? NULL: &p_e->m_value); + return const_point_iterator(p_e == 0 ? 0: &p_e->m_value); } inline bool @@ -315,7 +315,7 @@ namespace __gnu_pbds inc_it_state(const_pointer& r_p_value, entry_pointer& r_pos) const { r_pos = r_pos->m_p_next; - r_p_value = (r_pos == NULL) ? NULL : &r_pos->m_value; + r_p_value = (r_pos == 0) ? 0 : &r_pos->m_value; } template diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp index 908aacc19cd..7c8defcdf06 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp @@ -47,7 +47,7 @@ trace() const { std::cerr << m_p_l << std::endl << std::endl; const_entry_pointer p_l = m_p_l; - while (p_l != NULL) + while (p_l != 0) { std::cerr << PB_DS_V2F(p_l->m_value) << std::endl; p_l = p_l->m_p_next; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp index 4ef7fe48a82..8e476cb91b9 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 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 @@ -47,7 +47,7 @@ namespace __gnu_pbds // A list-update metadata type that moves elements to the front of // the list based on the counter algorithm. - template + template class counter_lu_metadata { public: diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp index 545b9816293..3245566e39a 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp @@ -49,9 +49,9 @@ PB_DS_CLASS_C_DEC::s_metadata_alloc; PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: PB_DS_OV_TREE_CLASS_NAME() : - m_a_values(NULL), - m_a_metadata(NULL), - m_end_it(NULL), + m_a_values(0), + m_a_metadata(0), + m_end_it(0), m_size(0) { _GLIBCXX_DEBUG_ONLY(PB_DS_CLASS_C_DEC::assert_valid();) } @@ -59,9 +59,9 @@ PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: PB_DS_OV_TREE_CLASS_NAME(const Cmp_Fn& r_cmp_fn) : cmp_fn_base(r_cmp_fn), - m_a_values(NULL), - m_a_metadata(NULL), - m_end_it(NULL), + m_a_values(0), + m_a_metadata(0), + m_end_it(0), m_size(0) { _GLIBCXX_DEBUG_ONLY(PB_DS_CLASS_C_DEC::assert_valid();) } @@ -70,9 +70,9 @@ PB_DS_CLASS_C_DEC:: PB_DS_OV_TREE_CLASS_NAME(const Cmp_Fn& r_cmp_fn, const node_update& r_node_update) : cmp_fn_base(r_cmp_fn), node_update(r_node_update), - m_a_values(NULL), - m_a_metadata(NULL), - m_end_it(NULL), + m_a_values(0), + m_a_metadata(0), + m_end_it(0), m_size(0) { _GLIBCXX_DEBUG_ONLY(PB_DS_CLASS_C_DEC::assert_valid();) } @@ -87,9 +87,9 @@ PB_DS_OV_TREE_CLASS_NAME(const PB_DS_CLASS_C_DEC& other) : #endif cmp_fn_base(other), node_update(other), - m_a_values(NULL), - m_a_metadata(NULL), - m_end_it(NULL), + m_a_values(0), + m_a_metadata(0), + m_end_it(0), m_size(0) { copy_from_ordered_range(other.begin(), other.end()); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp index c32a8af48c7..9b7011b1ff6 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp @@ -47,8 +47,8 @@ assert_valid() const { std::cout << "av1" << std::endl; - if (m_a_values == NULL || m_end_it == NULL || m_size == 0) - _GLIBCXX_DEBUG_ASSERT(m_a_values == NULL && m_end_it == NULL && m_size == 0); + if (m_a_values == 0 || m_end_it == 0 || m_size == 0) + _GLIBCXX_DEBUG_ASSERT(m_a_values == 0 && m_end_it == 0 && m_size == 0); std::cout << "av2" << std::endl; assert_iterators(); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp index 05e7d1a1107..dd24114f490 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp @@ -56,7 +56,7 @@ clear() } _GLIBCXX_DEBUG_ONLY(debug_base::clear();) - m_a_values = NULL; + m_a_values = 0; m_size = 0; m_end_it = m_a_values; _GLIBCXX_DEBUG_ONLY(assert_valid();) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp index 91d277b0cae..08d6bfc2293 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp @@ -50,9 +50,9 @@ void PB_DS_CLASS_C_DEC:: reallocate_metadata(Node_Update_* , size_type new_size) { - metadata_pointer a_new_metadata_vec =(new_size == 0) ? NULL : s_metadata_alloc.allocate(new_size); + metadata_pointer a_new_metadata_vec =(new_size == 0) ? 0 : s_metadata_alloc.allocate(new_size); - if (m_a_metadata != NULL) + if (m_a_metadata != 0) { for (size_type i = 0; i < m_size; ++i) m_a_metadata[i].~metadata_type(); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp index 7652c4c2ea2..0417ae1dd9e 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp @@ -69,8 +69,8 @@ PB_DS_node_begin_imp() const { return const_node_iterator(const_cast(mid_pointer(begin(), end())), const_cast(begin()), - const_cast(end()),(m_a_metadata == NULL)? - NULL : + const_cast(end()),(m_a_metadata == 0)? + 0 : mid_pointer(m_a_metadata, m_a_metadata + m_size)); } @@ -80,7 +80,7 @@ PB_DS_CLASS_C_DEC:: PB_DS_node_end_imp() const { return const_node_iterator(end(), end(), end(), - (m_a_metadata == NULL) ? NULL : m_a_metadata + m_size); + (m_a_metadata == 0) ? 0 : m_a_metadata + m_size); } PB_DS_CLASS_T_DEC @@ -89,7 +89,7 @@ PB_DS_CLASS_C_DEC:: PB_DS_node_begin_imp() { return node_iterator(mid_pointer(begin(), end()), begin(), end(), - (m_a_metadata == NULL) ? NULL : mid_pointer(m_a_metadata, m_a_metadata + m_size)); + (m_a_metadata == 0) ? 0 : mid_pointer(m_a_metadata, m_a_metadata + m_size)); } PB_DS_CLASS_T_DEC @@ -98,6 +98,6 @@ PB_DS_CLASS_C_DEC:: PB_DS_node_end_imp() { return node_iterator(end(), end(), - end(),(m_a_metadata == NULL) ? NULL : m_a_metadata + m_size); + end(),(m_a_metadata == 0) ? 0 : m_a_metadata + m_size); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp index 68fedc0eb05..1c45c51c1d8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp @@ -118,7 +118,7 @@ namespace __gnu_pbds public: inline - ov_tree_node_const_it_(const_pointer p_nd = NULL, const_pointer p_begin_nd = NULL, const_pointer p_end_nd = NULL, const_metadata_pointer p_metadata = NULL) : m_p_value(const_cast(p_nd)), m_p_begin_value(const_cast(p_begin_nd)), m_p_end_value(const_cast(p_end_nd)), m_p_metadata(p_metadata) + ov_tree_node_const_it_(const_pointer p_nd = 0, const_pointer p_begin_nd = 0, const_pointer p_end_nd = 0, const_metadata_pointer p_metadata = 0) : m_p_value(const_cast(p_nd)), m_p_begin_value(const_cast(p_begin_nd)), m_p_end_value(const_cast(p_end_nd)), m_p_metadata(p_metadata) { } inline const_reference @@ -134,7 +134,7 @@ namespace __gnu_pbds }; PB_DS_STATIC_ASSERT(should_have_metadata, has_metadata); - _GLIBCXX_DEBUG_ASSERT(m_p_metadata != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_metadata != 0); return *m_p_metadata; } @@ -164,8 +164,8 @@ namespace __gnu_pbds return (this_type(mid_pointer(m_p_value + 1, m_p_end_value), m_p_value + 1, - m_p_end_value,(m_p_metadata == NULL) ? - NULL : mid_pointer(m_p_metadata + 1, p_end_metadata))); + m_p_end_value,(m_p_metadata == 0) ? + 0 : mid_pointer(m_p_metadata + 1, p_end_metadata))); } inline bool @@ -241,7 +241,7 @@ namespace __gnu_pbds public: inline - ov_tree_node_it_(const_pointer p_nd = NULL, const_pointer p_begin_nd = NULL, const_pointer p_end_nd = NULL, const_metadata_pointer p_metadata = NULL) : base_type(p_nd, p_begin_nd, p_end_nd, p_metadata) + ov_tree_node_it_(const_pointer p_nd = 0, const_pointer p_begin_nd = 0, const_pointer p_end_nd = 0, const_metadata_pointer p_metadata = 0) : base_type(p_nd, p_begin_nd, p_end_nd, p_metadata) { } // Access. @@ -277,8 +277,8 @@ namespace __gnu_pbds return (this_type(base_type::mid_pointer(base_type::m_p_value + 1, base_type::m_p_end_value), base_type::m_p_value + 1, - base_type::m_p_end_value,(base_type::m_p_metadata == NULL)? - NULL : base_type::mid_pointer(base_type::m_p_metadata + 1, p_end_metadata))); + base_type::m_p_end_value,(base_type::m_p_metadata == 0)? + 0 : base_type::mid_pointer(base_type::m_p_metadata + 1, p_end_metadata))); } }; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp index 7c9fc13456a..51afa4fab92 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp @@ -45,8 +45,8 @@ void PB_DS_CLASS_C_DEC:: assert_valid() const { - _GLIBCXX_DEBUG_ASSERT(base_type::m_p_root == NULL - || base_type::m_p_root->m_p_next_sibling == NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::m_p_root == 0 + || base_type::m_p_root->m_p_next_sibling == 0); base_type::assert_valid(); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp index 905be1098cf..226e9531ada 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp @@ -48,8 +48,8 @@ pop() node_pointer p_new_root = join_node_children(base_type::m_p_root); _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_new_root, false);) - if (p_new_root != NULL) - p_new_root->m_p_prev_or_parent = NULL; + if (p_new_root != 0) + p_new_root->m_p_prev_or_parent = 0; base_type::actual_erase_node(base_type::m_p_root); base_type::m_p_root = p_new_root; @@ -78,27 +78,27 @@ remove_node(node_pointer p_nd) node_pointer p_new_child = join_node_children(p_nd); #ifdef _GLIBCXX_DEBUG - if (p_new_child != NULL) + if (p_new_child != 0) base_type::assert_node_consistent(p_new_child, false); #endif if (p_nd == base_type::m_p_root) { - if (p_new_child != NULL) - p_new_child->m_p_prev_or_parent = NULL; + if (p_new_child != 0) + p_new_child->m_p_prev_or_parent = 0; base_type::m_p_root = p_new_child; _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(base_type::m_p_root, false);) return; } - _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_prev_or_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_prev_or_parent != 0); if (p_nd->m_p_prev_or_parent->m_p_l_child == p_nd) { - if (p_new_child != NULL) + if (p_new_child != 0) { p_new_child->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; p_new_child->m_p_next_sibling = p_nd->m_p_next_sibling; - if (p_new_child->m_p_next_sibling != NULL) + if (p_new_child->m_p_next_sibling != 0) p_new_child->m_p_next_sibling->m_p_prev_or_parent = p_new_child; p_nd->m_p_prev_or_parent->m_p_l_child = p_new_child; _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd->m_p_prev_or_parent, false);) @@ -106,17 +106,17 @@ remove_node(node_pointer p_nd) } p_nd->m_p_prev_or_parent->m_p_l_child = p_nd->m_p_next_sibling; - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd->m_p_prev_or_parent, false);) return; } - if (p_new_child != NULL) + if (p_new_child != 0) { p_new_child->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; p_new_child->m_p_next_sibling = p_nd->m_p_next_sibling; - if (p_new_child->m_p_next_sibling != NULL) + if (p_new_child->m_p_next_sibling != 0) p_new_child->m_p_next_sibling->m_p_prev_or_parent = p_new_child; p_new_child->m_p_prev_or_parent->m_p_next_sibling = p_new_child; _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd->m_p_prev_or_parent, false);) @@ -124,7 +124,7 @@ remove_node(node_pointer p_nd) } p_nd->m_p_prev_or_parent->m_p_next_sibling = p_nd->m_p_next_sibling; - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd->m_p_prev_or_parent, false);) } @@ -134,11 +134,11 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: join_node_children(node_pointer p_nd) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); node_pointer p_ret = p_nd->m_p_l_child; - if (p_ret == NULL) - return NULL; - while (p_ret->m_p_next_sibling != NULL) + if (p_ret == 0) + return 0; + while (p_ret->m_p_next_sibling != 0) p_ret = forward_join(p_ret, p_ret->m_p_next_sibling); while (p_ret->m_p_prev_or_parent != p_nd) p_ret = back_join(p_ret->m_p_prev_or_parent, p_ret); @@ -151,17 +151,17 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: forward_join(node_pointer p_nd, node_pointer p_next) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling == p_next); if (Cmp_Fn::operator()(p_nd->m_value, p_next->m_value)) { p_next->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; base_type::make_child_of(p_nd, p_next); - return p_next->m_p_next_sibling == NULL + return p_next->m_p_next_sibling == 0 ? p_next : p_next->m_p_next_sibling; } - if (p_next->m_p_next_sibling != NULL) + if (p_next->m_p_next_sibling != 0) { p_next->m_p_next_sibling->m_p_prev_or_parent = p_nd; p_nd->m_p_next_sibling = p_next->m_p_next_sibling; @@ -169,7 +169,7 @@ forward_join(node_pointer p_nd, node_pointer p_next) return p_nd->m_p_next_sibling; } - p_nd->m_p_next_sibling = NULL; + p_nd->m_p_next_sibling = 0; base_type::make_child_of(p_next, p_nd); _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd, false)); return p_nd; @@ -180,8 +180,8 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: back_join(node_pointer p_nd, node_pointer p_next) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); - _GLIBCXX_DEBUG_ASSERT(p_next->m_p_next_sibling == NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); + _GLIBCXX_DEBUG_ASSERT(p_next->m_p_next_sibling == 0); if (Cmp_Fn::operator()(p_nd->m_value, p_next->m_value)) { @@ -191,7 +191,7 @@ back_join(node_pointer p_nd, node_pointer p_next) return p_next; } - p_nd->m_p_next_sibling = NULL; + p_nd->m_p_next_sibling = 0; base_type::make_child_of(p_next, p_nd); _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd, false)); return p_nd; @@ -212,7 +212,7 @@ erase_if(Pred pred) base_type::to_linked_list(); node_pointer p_out = base_type::prune(pred); size_type ersd = 0; - while (p_out != NULL) + while (p_out != 0) { ++ersd; node_pointer p_next = p_out->m_p_next_sibling; @@ -221,11 +221,11 @@ erase_if(Pred pred) } node_pointer p_cur = base_type::m_p_root; - base_type::m_p_root = NULL; - while (p_cur != NULL) + base_type::m_p_root = 0; + while (p_cur != 0) { node_pointer p_next = p_cur->m_p_next_sibling; - p_cur->m_p_l_child = p_cur->m_p_next_sibling = p_cur->m_p_prev_or_parent = NULL; + p_cur->m_p_l_child = p_cur->m_p_next_sibling = p_cur->m_p_prev_or_parent = 0; push_imp(p_cur); p_cur = p_next; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp index b00e9d13cdf..af929e58131 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp @@ -59,17 +59,17 @@ inline void PB_DS_CLASS_C_DEC:: push_imp(node_pointer p_nd) { - p_nd->m_p_l_child = NULL; + p_nd->m_p_l_child = 0; - if (base_type::m_p_root == NULL) + if (base_type::m_p_root == 0) { - p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = NULL; + p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = 0; base_type::m_p_root = p_nd; } else if (Cmp_Fn::operator()(base_type::m_p_root->m_value, p_nd->m_value)) { - p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = NULL; + p_nd->m_p_next_sibling = p_nd->m_p_prev_or_parent = 0; base_type::make_child_of(base_type::m_p_root, p_nd); _GLIBCXX_DEBUG_ONLY(base_type::assert_node_consistent(p_nd, false)); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp index 85d4ddf074a..12032734f4e 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp @@ -61,7 +61,7 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_out = base_type::prune(pred); - while (p_out != NULL) + while (p_out != 0) { _GLIBCXX_DEBUG_ASSERT(base_type::m_size > 0); --base_type::m_size; @@ -70,7 +70,7 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_next = p_out->m_p_next_sibling; - p_out->m_p_l_child = p_out->m_p_next_sibling = p_out->m_p_prev_or_parent = NULL; + p_out->m_p_l_child = p_out->m_p_next_sibling = p_out->m_p_prev_or_parent = 0; other.push_imp(p_out); @@ -81,13 +81,13 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_cur = base_type::m_p_root; - base_type::m_p_root = NULL; + base_type::m_p_root = 0; - while (p_cur != NULL) + while (p_cur != 0) { node_pointer p_next = p_cur->m_p_next_sibling; - p_cur->m_p_l_child = p_cur->m_p_next_sibling = p_cur->m_p_prev_or_parent = NULL; + p_cur->m_p_l_child = p_cur->m_p_next_sibling = p_cur->m_p_prev_or_parent = 0; push_imp(p_cur); @@ -106,7 +106,7 @@ join(PB_DS_CLASS_C_DEC& other) _GLIBCXX_DEBUG_ONLY(assert_valid();) _GLIBCXX_DEBUG_ONLY(other.assert_valid();) - if (other.m_p_root == NULL) + if (other.m_p_root == 0) { _GLIBCXX_DEBUG_ONLY(assert_valid();) _GLIBCXX_DEBUG_ONLY(other.assert_valid();) @@ -114,7 +114,7 @@ join(PB_DS_CLASS_C_DEC& other) return; } - if (base_type::m_p_root == NULL) + if (base_type::m_p_root == 0) base_type::m_p_root = other.m_p_root; else if (Cmp_Fn::operator()(base_type::m_p_root->m_value, other.m_p_root->m_value)) { @@ -131,7 +131,7 @@ join(PB_DS_CLASS_C_DEC& other) base_type::m_size += other.m_size; - other.m_p_root = NULL; + other.m_p_root = 0; other.m_size = 0; _GLIBCXX_DEBUG_ONLY(assert_valid();) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp index 15f349efbed..8decad5a7f0 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp @@ -48,8 +48,8 @@ public: typedef node_pointer_reference reference; inline - iterator(node_pointer_pointer p_p_cur = NULL, - node_pointer_pointer p_p_end = NULL) + iterator(node_pointer_pointer p_p_cur = 0, + node_pointer_pointer p_p_end = 0) : const_iterator(p_p_cur, p_p_end) { } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp index bc349cf2dbd..5cc9c2234c6 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp @@ -53,8 +53,8 @@ public: public: inline - const_iterator(node_pointer_pointer p_p_cur = NULL, - node_pointer_pointer p_p_end = NULL) + const_iterator(node_pointer_pointer p_p_cur = 0, + node_pointer_pointer p_p_end = 0) : m_p_p_cur(p_p_cur), m_p_p_end(p_p_end) { } @@ -71,7 +71,7 @@ public: { do ++m_p_p_cur; - while (m_p_p_cur != m_p_p_end&& * m_p_p_cur == NULL); + while (m_p_p_cur != m_p_p_end&& * m_p_p_cur == 0); return *this; } @@ -101,7 +101,7 @@ protected: #ifdef _GLIBCXX_DEBUG void assert_referencible() const - { _GLIBCXX_DEBUG_ASSERT(m_p_p_cur != m_p_p_end&& * m_p_p_cur != NULL); } + { _GLIBCXX_DEBUG_ASSERT(m_p_p_cur != m_p_p_end&& * m_p_p_cur != 0); } #endif public: diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp index ca38f932a62..4d4b52a55eb 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp @@ -85,7 +85,7 @@ PB_DS_CLASS_NAME(const PB_DS_CLASS_C_DEC& other) : initialize(); m_size = other.m_size; _GLIBCXX_DEBUG_ONLY(other.assert_valid();) - if (other.m_p_head->m_p_parent == NULL) + if (other.m_p_head->m_p_parent == 0) { _GLIBCXX_DEBUG_ONLY(assert_valid();) return; @@ -143,7 +143,7 @@ PB_DS_CLASS_C_DEC:: initialize() { new (m_p_head) head(); - m_p_head->m_p_parent = NULL; + m_p_head->m_p_parent = 0; m_p_head->m_p_min = m_p_head; m_p_head->m_p_max = m_p_head; m_size = 0; @@ -164,7 +164,7 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: recursive_copy_node(const_node_pointer p_other_nd) { - _GLIBCXX_DEBUG_ASSERT(p_other_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_other_nd != 0); if (p_other_nd->m_type == pat_trie_leaf_node_type) { const_leaf_pointer p_other_leaf = static_cast(p_other_nd); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp index de75657881b..664206499b2 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp @@ -45,11 +45,11 @@ void PB_DS_CLASS_C_DEC:: assert_valid() const { - if (m_p_head->m_p_parent != NULL) + if (m_p_head->m_p_parent != 0) m_p_head->m_p_parent->assert_valid(this); assert_iterators(); assert_reverse_iterators(); - if (m_p_head->m_p_parent == NULL) + if (m_p_head->m_p_parent == 0) { _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_min == m_p_head); _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_max == m_p_head); @@ -99,7 +99,7 @@ typename PB_DS_CLASS_C_DEC::size_type PB_DS_CLASS_C_DEC:: recursive_count_leafs(const_node_pointer p_nd) { - if (p_nd == NULL) + if (p_nd == 0) return (0); if (p_nd->m_type == pat_trie_leaf_node_type) return (1); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp index 90988184a8d..57e998981a8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp @@ -44,7 +44,7 @@ PB_DS_CLASS_C_DEC:: erase(const_key_reference r_key) { node_pointer p_nd = find_imp(r_key); - if (p_nd == NULL || p_nd->m_type == pat_trie_internal_node_type) + if (p_nd == 0 || p_nd->m_type == pat_trie_internal_node_type) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(r_key)); return false; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp index 2552ead8bc5..f53af256339 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp @@ -46,7 +46,7 @@ find(const_key_reference r_key) _GLIBCXX_DEBUG_ONLY(assert_valid();) node_pointer p_nd = find_imp(r_key); - if (p_nd == NULL || p_nd->m_type != pat_trie_leaf_node_type) + if (p_nd == 0 || p_nd->m_type != pat_trie_leaf_node_type) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(r_key);) return end(); @@ -71,7 +71,7 @@ find(const_key_reference r_key) const const_node_pointer p_nd = const_cast(this)->find_imp(r_key); - if (p_nd == NULL || p_nd->m_type != pat_trie_leaf_node_type) + if (p_nd == 0 || p_nd->m_type != pat_trie_leaf_node_type) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_does_not_exist(r_key);) return end(); @@ -93,7 +93,7 @@ PB_DS_CLASS_C_DEC:: find_imp(const_key_reference r_key) { if (empty()) - return (NULL); + return (0); typename synth_e_access_traits::const_iterator b_it = synth_e_access_traits::begin(r_key); @@ -101,14 +101,14 @@ find_imp(const_key_reference r_key) synth_e_access_traits::end(r_key); node_pointer p_nd = m_p_head->m_p_parent; - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); while (p_nd->m_type != pat_trie_leaf_node_type) { _GLIBCXX_DEBUG_ASSERT(p_nd->m_type == pat_trie_internal_node_type); node_pointer p_next_nd = static_cast(p_nd)->get_child_node(b_it, e_it, this); - if (p_next_nd == NULL) + if (p_next_nd == 0) return p_nd; p_nd = p_next_nd; } @@ -124,7 +124,7 @@ lower_bound_imp(const_key_reference r_key) return (m_p_head); node_pointer p_nd = m_p_head->m_p_parent; - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); typename PB_DS_CLASS_C_DEC::const_e_iterator b_it = synth_e_access_traits::begin(r_key); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp index e6049743f61..de3cb35276b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp @@ -165,7 +165,7 @@ rec_join_prep(const_internal_node_pointer p_l, const_internal_node_pointer p_r, it != p_r->end(); ++ it) { const_node_pointer p_l_join_child = p_l->get_join_child(*it, this); - if (p_l_join_child != NULL) + if (p_l_join_child != 0) rec_join_prep(p_l_join_child, * it, r_bag); } return; @@ -175,7 +175,7 @@ rec_join_prep(const_internal_node_pointer p_l, const_internal_node_pointer p_r, p_r->should_be_mine(p_l->pref_b_it(), p_l->pref_e_it(), 0, this)) { const_node_pointer p_r_join_child = p_r->get_join_child(p_l, this); - if (p_r_join_child != NULL) + if (p_r_join_child != 0) rec_join_prep(p_r_join_child, p_l, r_bag); return; } @@ -184,7 +184,7 @@ rec_join_prep(const_internal_node_pointer p_l, const_internal_node_pointer p_r, p_r->should_be_mine(p_l->pref_b_it(), p_l->pref_e_it(), 0, this)) { const_node_pointer p_r_join_child = p_r->get_join_child(p_l, this); - if (p_r_join_child != NULL) + if (p_r_join_child != 0) rec_join_prep(p_r_join_child, p_l, r_bag); return; } @@ -196,8 +196,8 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: rec_join(node_pointer p_l, node_pointer p_r, size_type checked_ind, split_join_branch_bag& r_bag) { - _GLIBCXX_DEBUG_ASSERT(p_r != NULL); - if (p_l == NULL) + _GLIBCXX_DEBUG_ASSERT(p_r != 0); + if (p_l == 0) { apply_update(p_r, (node_update* )this); return (p_r); @@ -245,8 +245,8 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: rec_join(leaf_pointer p_l, leaf_pointer p_r, split_join_branch_bag& r_bag) { - _GLIBCXX_DEBUG_ASSERT(p_r != NULL); - if (p_l == NULL) + _GLIBCXX_DEBUG_ASSERT(p_r != 0); + if (p_l == 0) return (p_r); node_pointer p_ret = insert_branch(p_l, p_r, r_bag); _GLIBCXX_DEBUG_ASSERT(recursive_count_leafs(p_ret) == 2); @@ -264,7 +264,7 @@ rec_join(leaf_pointer p_l, internal_node_pointer p_r, size_type checked_ind, const size_type rhs_leafs = recursive_count_leafs(p_r); #endif - _GLIBCXX_DEBUG_ASSERT(p_r != NULL); + _GLIBCXX_DEBUG_ASSERT(p_r != 0); node_pointer p_ret = rec_join(p_r, p_l, checked_ind, r_bag); _GLIBCXX_DEBUG_ASSERT(recursive_count_leafs(p_ret) == lhs_leafs + rhs_leafs); return p_ret; @@ -275,8 +275,8 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: rec_join(internal_node_pointer p_l, leaf_pointer p_r, size_type checked_ind, split_join_branch_bag& r_bag) { - _GLIBCXX_DEBUG_ASSERT(p_l != NULL); - _GLIBCXX_DEBUG_ASSERT(p_r != NULL); + _GLIBCXX_DEBUG_ASSERT(p_l != 0); + _GLIBCXX_DEBUG_ASSERT(p_r != 0); #ifdef _GLIBCXX_DEBUG const size_type lhs_leafs = recursive_count_leafs(p_l); @@ -313,8 +313,8 @@ typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: rec_join(internal_node_pointer p_l, internal_node_pointer p_r, split_join_branch_bag& r_bag) { - _GLIBCXX_DEBUG_ASSERT(p_l != NULL); - _GLIBCXX_DEBUG_ASSERT(p_r != NULL); + _GLIBCXX_DEBUG_ASSERT(p_l != 0); + _GLIBCXX_DEBUG_ASSERT(p_r != 0); #ifdef _GLIBCXX_DEBUG const size_type lhs_leafs = recursive_count_leafs(p_l); @@ -378,7 +378,7 @@ PB_DS_CLASS_C_DEC:: insert(const_reference r_val) { node_pointer p_lf = find_imp(PB_DS_V2F(r_val)); - if (p_lf != NULL && p_lf->m_type == pat_trie_leaf_node_type && + if (p_lf != 0 && p_lf->m_type == pat_trie_leaf_node_type && synth_e_access_traits::equal_keys(PB_DS_V2F(static_cast(p_lf)->value()), PB_DS_V2F(r_val))) { _GLIBCXX_DEBUG_ONLY(debug_base::check_key_exists(PB_DS_V2F(r_val))); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp index bf2f42916dd..56cf1330497 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 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 @@ -226,7 +226,7 @@ namespace __gnu_pbds get_pref_pos(const_e_iterator b_it, const_e_iterator e_it, const_e_access_traits_pointer p_traits) const { - if (static_cast(std::distance(b_it, e_it)) <= m_e_ind) + if (static_cast(std::distance(b_it, e_it)) <= m_e_ind) return 0; std::advance(b_it, m_e_ind); return 1 + p_traits->e_pos(*b_it); @@ -240,7 +240,7 @@ namespace __gnu_pbds { std::advance(m_pref_e_it, m_e_ind); std::fill(m_a_p_children, m_a_p_children + arr_size, - static_cast(NULL)); + static_cast(0)); } PB_DS_CLASS_T_DEC @@ -317,7 +317,7 @@ namespace __gnu_pbds { const size_type i = get_pref_pos(b_it, e_it, p_traits); _GLIBCXX_DEBUG_ASSERT(i < arr_size); - _GLIBCXX_DEBUG_ASSERT(m_a_p_children[i] != NULL); + _GLIBCXX_DEBUG_ASSERT(m_a_p_children[i] != 0); return iterator(m_a_p_children + i, m_a_p_children + i); } @@ -345,11 +345,11 @@ namespace __gnu_pbds size_type i = get_pref_pos(b_it, e_it, p_traits); _GLIBCXX_DEBUG_ASSERT(i < arr_size); - if (m_a_p_children[i] != NULL) + if (m_a_p_children[i] != 0) return m_a_p_children[i]; while (++i < arr_size) - if (m_a_p_children[i] != NULL) + if (m_a_p_children[i] != 0) { if (m_a_p_children[i]->m_type == pat_trie_leaf_node_type) return m_a_p_children[i]; @@ -370,7 +370,7 @@ namespace __gnu_pbds { const size_type i = get_pref_pos(b_it, e_it, p_traits); _GLIBCXX_DEBUG_ASSERT(i < arr_size); - if (m_a_p_children[i] == NULL) + if (m_a_p_children[i] == 0) { m_a_p_children[i] = p_nd; p_nd->m_p_parent = this; @@ -423,7 +423,7 @@ namespace __gnu_pbds for (; i < arr_size; ++i) if (m_a_p_children[i] == p_nd) { - m_a_p_children[i] = NULL; + m_a_p_children[i] = 0; return; } _GLIBCXX_DEBUG_ASSERT(i != arr_size); @@ -436,7 +436,7 @@ namespace __gnu_pbds { iterator ret = it; ++ret; - * it.m_p_p_cur = NULL; + * it.m_p_p_cur = 0; return ret; } @@ -558,7 +558,7 @@ namespace __gnu_pbds get_begin_pos() const { size_type i; - for (i = 0; i < arr_size && m_a_p_children[i] == NULL; ++i) + for (i = 0; i < arr_size && m_a_p_children[i] == 0; ++i) ; return i; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp index 9902d96dbb1..893a762056d 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp @@ -110,11 +110,11 @@ PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::const_node_iterator PB_DS_CLASS_C_DEC:: node_end() const -{ return const_node_iterator(NULL, this); } +{ return const_node_iterator(0, this); } PB_DS_CLASS_T_DEC inline typename PB_DS_CLASS_C_DEC::node_iterator PB_DS_CLASS_C_DEC:: node_end() -{ return node_iterator(NULL, this); } +{ return node_iterator(0, this); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp index 37250091d00..eb5e0002b9f 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp @@ -180,8 +180,8 @@ namespace __gnu_pbds pat_trie_const_node_it_() */ inline - pat_trie_const_node_it_(node_pointer p_nd = NULL, - const_e_access_traits_pointer p_traits = NULL) + pat_trie_const_node_it_(node_pointer p_nd = 0, + const_e_access_traits_pointer p_traits = 0) : m_p_nd(const_cast(p_nd)), m_p_traits(p_traits) { } @@ -299,7 +299,7 @@ namespace __gnu_pbds */ inline - pat_trie_node_it_(node_pointer p_nd = NULL, const_e_access_traits_pointer p_traits = NULL) : base_type(p_nd, p_traits) + pat_trie_node_it_(node_pointer p_nd = 0, const_e_access_traits_pointer p_traits = 0) : base_type(p_nd, p_traits) { } // Access; returns the iterator* associated with the current leaf. diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp index cada9071c51..0a142478eb8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp @@ -145,7 +145,7 @@ namespace __gnu_pbds public: inline - pat_trie_const_it_(node_pointer p_nd = NULL) : m_p_nd(p_nd) + pat_trie_const_it_(node_pointer p_nd = 0) : m_p_nd(p_nd) { } inline @@ -245,7 +245,7 @@ namespace __gnu_pbds node_pointer p_y = m_p_nd->m_p_parent; while (p_y->m_type != pat_trie_head_node_type && - get_larger_sibling(m_p_nd) == NULL) + get_larger_sibling(m_p_nd) == 0) { m_p_nd = p_y; p_y = p_y->m_p_parent; @@ -274,7 +274,7 @@ namespace __gnu_pbds node_pointer p_y = m_p_nd->m_p_parent; while (p_y->m_type != pat_trie_head_node_type && - get_smaller_sibling(m_p_nd) == NULL) + get_smaller_sibling(m_p_nd) == 0) { m_p_nd = p_y; p_y = p_y->m_p_parent; @@ -300,7 +300,7 @@ namespace __gnu_pbds typename Internal_Node::iterator next_it = it; ++next_it; - return ((next_it == p_parent->end())? NULL :* next_it); + return ((next_it == p_parent->end())? 0 :* next_it); } inline static node_pointer @@ -312,7 +312,7 @@ namespace __gnu_pbds typename Internal_Node::iterator it = p_parent->begin(); if (*it == p_nd) - return (NULL); + return (0); typename Internal_Node::iterator prev_it; do { @@ -324,7 +324,7 @@ namespace __gnu_pbds while (true); _GLIBCXX_DEBUG_ASSERT(false); - return (NULL); + return (0); } inline static leaf_pointer @@ -397,7 +397,7 @@ namespace __gnu_pbds typedef typename Type_Traits::reference reference; inline - pat_trie_it_(node_pointer p_nd = NULL) : PB_DS_CONST_IT_C_DEC((node_pointer)p_nd) + pat_trie_it_(node_pointer p_nd = 0) : PB_DS_CONST_IT_C_DEC((node_pointer)p_nd) { } inline diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp index 52edf250635..bfb456392b2 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp @@ -93,7 +93,7 @@ void PB_DS_CLASS_C_DEC:: clear_imp(node_pointer p_nd) { - if (p_nd == NULL) + if (p_nd == 0) return; clear_imp(p_nd->m_p_left); clear_imp(p_nd->m_p_right); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp index c0809fa48bc..40dc38c71b4 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp @@ -46,7 +46,7 @@ rotate_left(node_pointer p_x) node_pointer p_y = p_x->m_p_right; p_x->m_p_right = p_y->m_p_left; - if (p_y->m_p_left != NULL) + if (p_y->m_p_left != 0) p_y->m_p_left->m_p_parent = p_x; p_y->m_p_parent = p_x->m_p_parent; @@ -75,7 +75,7 @@ rotate_right(node_pointer p_x) node_pointer p_y = p_x->m_p_left; p_x->m_p_left = p_y->m_p_right; - if (p_y->m_p_right != NULL) + if (p_y->m_p_right != 0) p_y->m_p_right->m_p_parent = p_x; p_y->m_p_parent = p_x->m_p_parent; @@ -122,10 +122,10 @@ inline void PB_DS_CLASS_C_DEC:: apply_update(node_pointer p_nd, Node_Update_* p_update) { - p_update->operator()(& PB_DS_V2F(p_nd->m_value),(p_nd->m_p_left == NULL) ? - NULL : - & PB_DS_V2F(p_nd->m_p_left->m_value),(p_nd->m_p_right == NULL) ? - NULL : + p_update->operator()(& PB_DS_V2F(p_nd->m_value),(p_nd->m_p_left == 0) ? + 0 : + & PB_DS_V2F(p_nd->m_p_left->m_value),(p_nd->m_p_right == 0) ? + 0 : & PB_DS_V2F(p_nd->m_p_right->m_value)); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp index 9779a4bcd22..320d32c0667 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp @@ -47,7 +47,7 @@ split(const_key_reference r_key, PB_DS_CLASS_C_DEC& other) _GLIBCXX_DEBUG_ONLY(other.assert_valid();); split_join_branch_bag bag; leaf_pointer p_split_lf = split_prep(r_key, other, bag); - if (p_split_lf == NULL) + if (p_split_lf == 0) { _GLIBCXX_DEBUG_ASSERT(bag.empty()); _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -88,7 +88,7 @@ split_prep(const_key_reference r_key, PB_DS_CLASS_C_DEC& other, split_join_branc other.clear(); _GLIBCXX_DEBUG_ONLY(assert_valid();); _GLIBCXX_DEBUG_ONLY(other.assert_valid();); - return (NULL); + return (0); } if (synth_e_access_traits::cmp_keys(r_key, @@ -98,7 +98,7 @@ split_prep(const_key_reference r_key, PB_DS_CLASS_C_DEC& other, split_join_branc value_swap(other); _GLIBCXX_DEBUG_ONLY(assert_valid();); _GLIBCXX_DEBUG_ONLY(other.assert_valid();); - return (NULL); + return (0); } if (!synth_e_access_traits::cmp_keys(r_key, @@ -106,7 +106,7 @@ split_prep(const_key_reference r_key, PB_DS_CLASS_C_DEC& other, split_join_branc { _GLIBCXX_DEBUG_ONLY(assert_valid();); _GLIBCXX_DEBUG_ONLY(other.assert_valid();); - return (NULL); + return (0); } iterator it = lower_bound(r_key); @@ -134,7 +134,7 @@ rec_split(node_pointer p_nd, const_e_iterator b_it, const_e_iterator e_it, PB_DS { if (p_nd->m_type == pat_trie_leaf_node_type) { - _GLIBCXX_DEBUG_ASSERT(other.m_p_head->m_p_parent == NULL); + _GLIBCXX_DEBUG_ASSERT(other.m_p_head->m_p_parent == 0); return (p_nd); } @@ -202,27 +202,27 @@ PB_DS_CLASS_C_DEC:: split_insert_branch(size_type e_ind, const_e_iterator b_it, typename internal_node::iterator child_b_it, size_type num_children, split_join_branch_bag& r_bag) { #ifdef _GLIBCXX_DEBUG - if (m_p_head->m_p_parent != NULL) + if (m_p_head->m_p_parent != 0) m_p_head->m_p_parent->assert_valid(this); #endif - const size_type total_num_children =((m_p_head->m_p_parent == NULL)? 0 : 1) + num_children; + const size_type total_num_children =((m_p_head->m_p_parent == 0)? 0 : 1) + num_children; if (total_num_children == 0) { - _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_parent == NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_parent == 0); return; } if (total_num_children == 1) { - if (m_p_head->m_p_parent != NULL) + if (m_p_head->m_p_parent != 0) { _GLIBCXX_DEBUG_ONLY(m_p_head->m_p_parent->assert_valid(this);) return; } - _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_parent == NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_head->m_p_parent == 0); m_p_head->m_p_parent =* child_b_it; m_p_head->m_p_parent->m_p_parent = m_p_head; apply_update(m_p_head->m_p_parent, (node_update* )this); @@ -242,7 +242,7 @@ split_insert_branch(size_type e_ind, const_e_iterator b_it, typename internal_no ++child_b_it; } - if (m_p_head->m_p_parent != NULL) + if (m_p_head->m_p_parent != 0) p_new_root->add_child(m_p_head->m_p_parent, pref_begin(m_p_head->m_p_parent), pref_end(m_p_head->m_p_parent), this); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp index e4b20943be6..e6af80413a4 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp @@ -46,7 +46,7 @@ PB_DS_CLASS_C_DEC:: trace() const { std::cerr << std::endl; - if (m_p_head->m_p_parent == NULL) + if (m_p_head->m_p_parent == 0) return; trace_node(m_p_head->m_p_parent, 0); std::cerr << std::endl; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp index 6d275e731d1..1eecdc10990 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp @@ -51,5 +51,5 @@ PB_DS_CLASS_C_DEC:: apply_update(node_pointer p_nd, Node_Update_* /*p_update*/) { Node_Update_::operator()(node_iterator(p_nd, this), - const_node_iterator(NULL, this)); + const_node_iterator(0, this)); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp index 18ecc4230ed..7cdadfc5f83 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp @@ -45,7 +45,7 @@ typename PB_DS_CLASS_C_DEC::size_type PB_DS_CLASS_C_DEC:: assert_node_consistent(const node_pointer p_nd) const { - if (p_nd == NULL) + if (p_nd == 0) return 1; const size_type l_height = assert_node_consistent(p_nd->m_p_left); @@ -67,7 +67,7 @@ assert_valid() const base_type::assert_valid(); const node_pointer p_head = base_type::m_p_head; _GLIBCXX_DEBUG_ASSERT(p_head->m_red); - if (p_head->m_p_parent != NULL) + if (p_head->m_p_parent != 0) { _GLIBCXX_DEBUG_ASSERT(!p_head->m_p_parent->m_red); assert_node_consistent(p_head->m_p_parent); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp index 685b8a51b6b..2ae4cef072c 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp @@ -123,17 +123,17 @@ remove_node(node_pointer p_z) { update_min_max_for_erased_node(p_z); node_pointer p_y = p_z; - node_pointer p_x = NULL; - node_pointer p_new_x_parent = NULL; + node_pointer p_x = 0; + node_pointer p_new_x_parent = 0; - if (p_y->m_p_left == NULL) + if (p_y->m_p_left == 0) p_x = p_y->m_p_right; - else if (p_y->m_p_right == NULL) + else if (p_y->m_p_right == 0) p_x = p_y->m_p_left; else { p_y = p_y->m_p_right; - while (p_y->m_p_left != NULL) + while (p_y->m_p_left != 0) p_y = p_y->m_p_left; p_x = p_y->m_p_right; } @@ -141,7 +141,7 @@ remove_node(node_pointer p_z) if (p_y == p_z) { p_new_x_parent = p_y->m_p_parent; - if (p_x != NULL) + if (p_x != 0) p_x->m_p_parent = p_y->m_p_parent; if (base_type::m_p_head->m_p_parent == p_z) @@ -153,7 +153,7 @@ remove_node(node_pointer p_z) } else { - p_y->m_p_left = NULL; + p_y->m_p_left = 0; p_z->m_p_parent->m_p_right = p_x; } } @@ -164,7 +164,7 @@ remove_node(node_pointer p_z) if (p_y != p_z->m_p_right) { p_new_x_parent = p_y->m_p_parent; - if (p_x != NULL) + if (p_x != 0) p_x->m_p_parent = p_y->m_p_parent; p_y->m_p_parent->m_p_left = p_x; p_y->m_p_right = p_z->m_p_right; @@ -198,7 +198,7 @@ void PB_DS_CLASS_C_DEC:: remove_fixup(node_pointer p_x, node_pointer p_new_x_parent) { - _GLIBCXX_DEBUG_ASSERT(p_x == NULL || p_x->m_p_parent == p_new_x_parent); + _GLIBCXX_DEBUG_ASSERT(p_x == 0 || p_x->m_p_parent == p_new_x_parent); while (p_x != base_type::m_p_head->m_p_parent && is_effectively_black(p_x)) if (p_x == p_new_x_parent->m_p_left) @@ -223,7 +223,7 @@ remove_fixup(node_pointer p_x, node_pointer p_new_x_parent) { if (is_effectively_black(p_w->m_p_right)) { - if (p_w->m_p_left != NULL) + if (p_w->m_p_left != 0) p_w->m_p_left->m_red = false; p_w->m_red = true; @@ -234,7 +234,7 @@ remove_fixup(node_pointer p_x, node_pointer p_new_x_parent) p_w->m_red = p_new_x_parent->m_red; p_new_x_parent->m_red = false; - if (p_w->m_p_right != NULL) + if (p_w->m_p_right != 0) p_w->m_p_right->m_red = false; base_type::rotate_left(p_new_x_parent); @@ -264,7 +264,7 @@ remove_fixup(node_pointer p_x, node_pointer p_new_x_parent) { if (is_effectively_black(p_w->m_p_left)) { - if (p_w->m_p_right != NULL) + if (p_w->m_p_right != 0) p_w->m_p_right->m_red = false; p_w->m_red = true; @@ -275,7 +275,7 @@ remove_fixup(node_pointer p_x, node_pointer p_new_x_parent) p_w->m_red = p_new_x_parent->m_red; p_new_x_parent->m_red = false; - if (p_w->m_p_left != NULL) + if (p_w->m_p_left != 0) p_w->m_p_left->m_red = false; base_type::rotate_right(p_new_x_parent); @@ -284,6 +284,6 @@ remove_fixup(node_pointer p_x, node_pointer p_new_x_parent) } } - if (p_x != NULL) + if (p_x != 0) p_x->m_red = false; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp index 6b43b1a994c..97eba22f6f8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp @@ -42,5 +42,5 @@ PB_DS_CLASS_T_DEC inline bool PB_DS_CLASS_C_DEC:: is_effectively_black(const node_pointer p_nd) -{ return (p_nd == NULL || !p_nd->m_red); } +{ return (p_nd == 0 || !p_nd->m_red); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp index 16a5d1edb29..a6a60160cca 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp @@ -67,7 +67,7 @@ insert_fixup(node_pointer p_nd) if (p_nd->m_p_parent == p_nd->m_p_parent->m_p_parent->m_p_left) { node_pointer p_y = p_nd->m_p_parent->m_p_parent->m_p_right; - if (p_y != NULL && p_y->m_red) + if (p_y != 0 && p_y->m_red) { p_nd->m_p_parent->m_red = false; p_y->m_red = false; @@ -89,7 +89,7 @@ insert_fixup(node_pointer p_nd) else { node_pointer p_y = p_nd->m_p_parent->m_p_parent->m_p_left; - if (p_y != NULL && p_y->m_red) + if (p_y != 0 && p_y->m_red) { p_nd->m_p_parent->m_red = false; p_y->m_red = false; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp index 9776a8d9a34..96280564dd2 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp @@ -67,8 +67,8 @@ void PB_DS_CLASS_C_DEC:: join_imp(node_pointer p_x, node_pointer p_r) { - _GLIBCXX_DEBUG_ASSERT(p_x != NULL); - if (p_r != NULL) + _GLIBCXX_DEBUG_ASSERT(p_x != 0); + if (p_r != 0) p_r->m_red = false; const size_type h = black_height(base_type::m_p_head->m_p_parent); @@ -88,7 +88,7 @@ join_imp(node_pointer p_x, node_pointer p_r) { p_x_l = base_type::m_p_head->m_p_parent; base_type::m_p_head->m_p_parent = p_r; - if (p_r != NULL) + if (p_r != 0) p_r->m_p_parent = base_type::m_p_head; join_pos = find_join_pos_left(base_type::m_p_head->m_p_parent, @@ -112,11 +112,11 @@ join_imp(node_pointer p_x, node_pointer p_r) } p_x->m_p_left = p_x_l; - if (p_x_l != NULL) + if (p_x_l != 0) p_x_l->m_p_parent = p_x; p_x->m_p_right = p_x_r; - if (p_x_r != NULL) + if (p_x_r != 0) p_x_r->m_p_parent = p_x; p_x->m_red = true; @@ -153,8 +153,8 @@ find_join_pos_right(node_pointer p_l, size_type h_l, size_type h_r) { _GLIBCXX_DEBUG_ASSERT(h_l >= h_r); - if (base_type::m_p_head->m_p_parent == NULL) - return (std::make_pair((node_pointer)NULL, base_type::m_p_head)); + if (base_type::m_p_head->m_p_parent == 0) + return (std::make_pair((node_pointer)0, base_type::m_p_head)); node_pointer p_l_parent = base_type::m_p_head; while (h_l > h_r) @@ -177,7 +177,7 @@ find_join_pos_right(node_pointer p_l, size_type h_l, size_type h_r) _GLIBCXX_DEBUG_ASSERT(is_effectively_black(p_l)); _GLIBCXX_DEBUG_ASSERT(black_height(p_l) == h_r); - _GLIBCXX_DEBUG_ASSERT(p_l == NULL || p_l->m_p_parent == p_l_parent); + _GLIBCXX_DEBUG_ASSERT(p_l == 0 || p_l->m_p_parent == p_l_parent); return std::make_pair(p_l, p_l_parent); } @@ -189,8 +189,8 @@ PB_DS_CLASS_C_DEC:: find_join_pos_left(node_pointer p_r, size_type h_l, size_type h_r) { _GLIBCXX_DEBUG_ASSERT(h_r > h_l); - if (base_type::m_p_head->m_p_parent == NULL) - return (std::make_pair((node_pointer)NULL, + if (base_type::m_p_head->m_p_parent == 0) + return (std::make_pair((node_pointer)0, base_type::m_p_head)); node_pointer p_r_parent = base_type::m_p_head; while (h_r > h_l) @@ -213,7 +213,7 @@ find_join_pos_left(node_pointer p_r, size_type h_l, size_type h_r) _GLIBCXX_DEBUG_ASSERT(is_effectively_black(p_r)); _GLIBCXX_DEBUG_ASSERT(black_height(p_r) == h_l); - _GLIBCXX_DEBUG_ASSERT(p_r == NULL || p_r->m_p_parent == p_r_parent); + _GLIBCXX_DEBUG_ASSERT(p_r == 0 || p_r->m_p_parent == p_r_parent); return std::make_pair(p_r, p_r_parent); } @@ -223,7 +223,7 @@ PB_DS_CLASS_C_DEC:: black_height(node_pointer p_nd) { size_type h = 1; - while (p_nd != NULL) + while (p_nd != 0) { if (p_nd->m_red == false) ++h; @@ -275,7 +275,7 @@ void PB_DS_CLASS_C_DEC:: split_at_node(node_pointer p_nd, PB_DS_CLASS_C_DEC& other) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); node_pointer p_l = p_nd->m_p_left; node_pointer p_r = p_nd->m_p_right; @@ -283,7 +283,7 @@ split_at_node(node_pointer p_nd, PB_DS_CLASS_C_DEC& other) if (p_parent == base_type::m_p_head) { base_type::m_p_head->m_p_parent = p_l; - if (p_l != NULL) + if (p_l != 0) { p_l->m_p_parent = base_type::m_p_head; p_l->m_red = false; @@ -296,7 +296,7 @@ split_at_node(node_pointer p_nd, PB_DS_CLASS_C_DEC& other) else p_parent->m_p_right = p_l; - if (p_l != NULL) + if (p_l != 0) p_l->m_p_parent = p_parent; update_to_top(p_parent, (node_update* )this); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp index 0194905c4c7..4b8878ee84c 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp @@ -48,7 +48,7 @@ assert_valid() const base_type::assert_valid(false); if (!base_type::empty()) { - _GLIBCXX_DEBUG_ASSERT(base_type::m_p_max != NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::m_p_max != 0); base_type::assert_max(); } @@ -57,7 +57,7 @@ assert_valid() const if (m_rc.empty()) { base_type::assert_valid(true); - _GLIBCXX_DEBUG_ASSERT(next_2_pointer(base_type::m_p_root) == NULL); + _GLIBCXX_DEBUG_ASSERT(next_2_pointer(base_type::m_p_root) == 0); return; } @@ -65,13 +65,13 @@ assert_valid() const typename rc_t::const_iterator it = m_rc.end(); --it; - while (p_nd != NULL) + while (p_nd != 0) { _GLIBCXX_DEBUG_ASSERT(*it == p_nd); const_node_pointer p_next = p_nd->m_p_next_sibling; - _GLIBCXX_DEBUG_ASSERT(p_next != NULL); + _GLIBCXX_DEBUG_ASSERT(p_next != 0); _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata == p_next->m_metadata); - _GLIBCXX_DEBUG_ASSERT(p_next->m_p_next_sibling == NULL || + _GLIBCXX_DEBUG_ASSERT(p_next->m_p_next_sibling == 0 || p_next->m_metadata < p_next->m_p_next_sibling->m_metadata); --it; @@ -85,13 +85,13 @@ typename PB_DS_CLASS_C_DEC::const_node_pointer PB_DS_CLASS_C_DEC:: next_2_pointer(const_node_pointer p_nd) { - if (p_nd == NULL) - return NULL; + if (p_nd == 0) + return 0; node_pointer p_next = p_nd->m_p_next_sibling; - if (p_next == NULL) - return NULL; + if (p_next == 0) + return 0; if (p_nd->m_metadata == p_next->m_metadata) return p_nd; @@ -104,13 +104,13 @@ typename PB_DS_CLASS_C_DEC::const_node_pointer PB_DS_CLASS_C_DEC:: next_after_0_pointer(const_node_pointer p_nd) { - if (p_nd == NULL) - return NULL; + if (p_nd == 0) + return 0; node_pointer p_next = p_nd->m_p_next_sibling; - if (p_next == NULL) - return NULL; + if (p_next == 0) + return 0; if (p_nd->m_metadata < p_next->m_metadata) return p_next; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp index 1113ffa6669..1f187a55749 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp @@ -64,10 +64,10 @@ PB_DS_CLASS_C_DEC:: make_binomial_heap() { node_pointer p_nd = base_type::m_p_root; - while (p_nd != NULL) + while (p_nd != 0) { node_pointer p_next = p_nd->m_p_next_sibling; - if (p_next == NULL) + if (p_next == 0) p_nd = p_next; else if (p_nd->m_metadata == p_next->m_metadata) p_nd = link_with_next_sibling(p_nd); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp index aef4b928e16..2a3badccb5b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp @@ -51,20 +51,20 @@ push(const_reference r_val) node_pointer p_nd = base_type::get_new_node_for_insert(r_val); - p_nd->m_p_l_child = p_nd->m_p_prev_or_parent = NULL; + p_nd->m_p_l_child = p_nd->m_p_prev_or_parent = 0; p_nd->m_metadata = 0; - if (base_type::m_p_max == NULL || Cmp_Fn::operator()(base_type::m_p_max->m_value, r_val)) + if (base_type::m_p_max == 0 || Cmp_Fn::operator()(base_type::m_p_max->m_value, r_val)) base_type::m_p_max = p_nd; p_nd->m_p_next_sibling = base_type::m_p_root; - if (base_type::m_p_root != NULL) + if (base_type::m_p_root != 0) base_type::m_p_root->m_p_prev_or_parent = p_nd; base_type::m_p_root = p_nd; - if (p_nd->m_p_next_sibling != NULL&& p_nd->m_p_next_sibling->m_metadata == 0) + if (p_nd->m_p_next_sibling != 0&& p_nd->m_p_next_sibling->m_metadata == 0) m_rc.push(p_nd); _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -95,14 +95,14 @@ link_with_next_sibling(node_pointer p_nd) { node_pointer p_next = p_nd->m_p_next_sibling; - _GLIBCXX_DEBUG_ASSERT(p_next != NULL); + _GLIBCXX_DEBUG_ASSERT(p_next != 0); _GLIBCXX_DEBUG_ASSERT(p_next->m_p_prev_or_parent == p_nd); if (Cmp_Fn::operator()(p_nd->m_value, p_next->m_value)) { p_next->m_p_prev_or_parent = p_nd->m_p_prev_or_parent; - if (p_next->m_p_prev_or_parent == NULL) + if (p_next->m_p_prev_or_parent == 0) base_type::m_p_root = p_next; else p_next->m_p_prev_or_parent->m_p_next_sibling = p_next; @@ -119,7 +119,7 @@ link_with_next_sibling(node_pointer p_nd) p_nd->m_p_next_sibling = p_next->m_p_next_sibling; - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) p_nd->m_p_next_sibling->m_p_prev_or_parent = p_nd; if (base_type::m_p_max == p_next) @@ -144,11 +144,11 @@ make_0_exposed() m_rc.pop(); - _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling != 0); _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata == p_nd->m_p_next_sibling->m_metadata); node_pointer p_res = link_with_next_sibling(p_nd); - if (p_res->m_p_next_sibling != NULL&& p_res->m_metadata == p_res->m_p_next_sibling->m_metadata) + if (p_res->m_p_next_sibling != 0&& p_res->m_metadata == p_res->m_p_next_sibling->m_metadata) m_rc.push(p_res); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp index a28f5ede5e6..c816cfdeac8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -150,7 +150,7 @@ inline PB_DS_CLASS_C_DEC::size_type PB_DS_CLASS_C_DEC:: get_nearest_smaller_size(size_type n) const { - const size_t* p_lower = std::lower_bound(detail::g_a_sizes, + const std::size_t* p_lower = std::lower_bound(detail::g_a_sizes, detail::g_a_sizes + detail::num_distinct_sizes, n); if (*p_lower >= n && p_lower != detail::g_a_sizes) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp index ed70b951121..33aecdf5fcc 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -47,7 +47,7 @@ class sample_resize_policy public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; // Default constructor. sample_resize_policy(); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp index a27dd942702..963c5530a46 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp @@ -1,6 +1,7 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -47,7 +48,7 @@ class sample_resize_trigger public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; // Default constructor. sample_resize_trigger(); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp index 1f2d3a9c125..9b3ba031c4b 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -47,7 +47,7 @@ class sample_size_policy public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; // Default constructor. sample_size_policy(); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp index 084e25d26de..f673877aed2 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp @@ -55,7 +55,7 @@ void PB_DS_CLASS_C_DEC:: assert_special_imp(const node_pointer p_nd) const { - if (p_nd == NULL) + if (p_nd == 0) return; if (p_nd == base_type::m_p_head) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp index 508f586d78d..507b8ba407c 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp @@ -108,7 +108,7 @@ void PB_DS_CLASS_C_DEC:: erase_node(node_pointer p_nd) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); splay(p_nd); _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -119,27 +119,27 @@ erase_node(node_pointer p_nd) base_type::update_min_max_for_erased_node(p_nd); base_type::actual_erase_node(p_nd); - if (p_r == NULL) + if (p_r == 0) { base_type::m_p_head->m_p_parent = p_l; - if (p_l != NULL) + if (p_l != 0) p_l->m_p_parent = base_type::m_p_head; _GLIBCXX_DEBUG_ONLY(assert_valid();) return; } node_pointer p_target_r = leftmost(p_r); - _GLIBCXX_DEBUG_ASSERT(p_target_r != NULL); + _GLIBCXX_DEBUG_ASSERT(p_target_r != 0); p_r->m_p_parent = base_type::m_p_head; base_type::m_p_head->m_p_parent = p_r; splay(p_target_r); - _GLIBCXX_DEBUG_ONLY(p_target_r->m_p_left = NULL); + _GLIBCXX_DEBUG_ONLY(p_target_r->m_p_left = 0); _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_parent == this->m_p_head); _GLIBCXX_DEBUG_ASSERT(this->m_p_head->m_p_parent == p_target_r); p_target_r->m_p_left = p_l; - if (p_l != NULL) + if (p_l != 0) p_l->m_p_parent = p_target_r; _GLIBCXX_DEBUG_ONLY(assert_valid();) apply_update(p_target_r, (node_update* )this); @@ -150,8 +150,8 @@ inline typename PB_DS_CLASS_C_DEC::node_pointer PB_DS_CLASS_C_DEC:: leftmost(node_pointer p_nd) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); - while (p_nd->m_p_left != NULL) + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); + while (p_nd->m_p_left != 0) p_nd = p_nd->m_p_left; return p_nd; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp index 182425a8f30..e27142c17ec 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp @@ -67,7 +67,7 @@ find_imp(const_key_reference r_key) { _GLIBCXX_DEBUG_ONLY(base_type::structure_only_assert_valid();) node_pointer p_nd = base_type::m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key)) { if (!Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value))) @@ -86,7 +86,7 @@ find_imp(const_key_reference r_key) const { _GLIBCXX_DEBUG_ONLY(assert_valid();) node_pointer p_nd = base_type::m_p_head->m_p_parent; - while (p_nd != NULL) + while (p_nd != 0) if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), r_key)) { if (!Cmp_Fn::operator()(r_key, PB_DS_V2F(p_nd->m_value))) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp index e9ae987b09d..8381174d29f 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp @@ -64,7 +64,7 @@ insert_leaf_imp(const_reference r_value) node_pointer p_nd = base_type::m_p_head->m_p_parent; node_pointer p_pot = base_type::m_p_head; - while (p_nd != NULL) + while (p_nd != 0) if (!Cmp_Fn::operator()(PB_DS_V2F(p_nd->m_value), PB_DS_V2F(r_value))) { if (!Cmp_Fn::operator()(PB_DS_V2F(r_value), PB_DS_V2F(p_nd->m_value))) @@ -83,10 +83,10 @@ insert_leaf_imp(const_reference r_value) _GLIBCXX_DEBUG_ONLY(base_type::check_key_does_not_exist(PB_DS_V2F(r_value))); p_nd = p_pot->m_p_left; - if (p_nd == NULL) + if (p_nd == 0) return (std::make_pair(base_type::insert_leaf_new(r_value, p_pot, true), true)); - while (p_nd->m_p_right != NULL) + while (p_nd->m_p_right != 0) p_nd = p_nd->m_p_right; return std::make_pair(insert_leaf_new(r_value, p_nd, false), true); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp index e4f3556a5f0..b6993590acb 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp @@ -114,11 +114,11 @@ splay_zig_zag_left(node_pointer p_nd, node_pointer p_parent, p_grandparent->m_p_parent = p_nd; p_parent->m_p_left = p_b; - if (p_b != NULL) + if (p_b != 0) p_b->m_p_parent = p_parent; p_grandparent->m_p_right = p_c; - if (p_c != NULL) + if (p_c != 0) p_c->m_p_parent = p_grandparent; splay_zz_end(p_nd, p_parent, p_grandparent); @@ -150,11 +150,11 @@ splay_zig_zag_right(node_pointer p_nd, node_pointer p_parent, p_grandparent->m_p_parent = p_nd; p_parent->m_p_right = p_b; - if (p_b != NULL) + if (p_b != 0) p_b->m_p_parent = p_parent; p_grandparent->m_p_left = p_c; - if (p_c != NULL) + if (p_c != 0) p_c->m_p_parent = p_grandparent; splay_zz_end(p_nd, p_parent, p_grandparent); @@ -186,11 +186,11 @@ splay_zig_zig_left(node_pointer p_nd, node_pointer p_parent, p_grandparent->m_p_parent = p_parent; p_parent->m_p_left = p_b; - if (p_b != NULL) + if (p_b != 0) p_b->m_p_parent = p_parent; p_grandparent->m_p_left = p_c; - if (p_c != NULL) + if (p_c != 0) p_c->m_p_parent = p_grandparent; splay_zz_end(p_nd, p_parent, p_grandparent); @@ -220,11 +220,11 @@ splay_zig_zig_right(node_pointer p_nd, node_pointer p_parent, p_grandparent->m_p_parent = p_parent; p_parent->m_p_right = p_b; - if (p_b != NULL) + if (p_b != 0) p_b->m_p_parent = p_parent; p_grandparent->m_p_right = p_c; - if (p_c != NULL) + if (p_c != 0) p_c->m_p_parent = p_grandparent; base_type::update_to_top(p_grandparent, (node_update* )this); @@ -242,9 +242,9 @@ splay_zz_start(node_pointer p_nd, #endif node_pointer p_grandparent) { - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); - _GLIBCXX_DEBUG_ASSERT(p_parent != NULL); - _GLIBCXX_DEBUG_ASSERT(p_grandparent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); + _GLIBCXX_DEBUG_ASSERT(p_parent != 0); + _GLIBCXX_DEBUG_ASSERT(p_grandparent != 0); const bool grandparent_head = p_grandparent->m_p_parent == base_type::m_p_head; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp index 7f0b2cb205d..401f22c0369 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp @@ -53,15 +53,15 @@ join(PB_DS_CLASS_C_DEC& other) } node_pointer p_target_r = other.leftmost(other.m_p_head); - _GLIBCXX_DEBUG_ASSERT(p_target_r != NULL); + _GLIBCXX_DEBUG_ASSERT(p_target_r != 0); other.splay(p_target_r); _GLIBCXX_DEBUG_ASSERT(p_target_r == other.m_p_head->m_p_parent); - _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_left == NULL); + _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_left == 0); p_target_r->m_p_left = base_type::m_p_head->m_p_parent; - _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_left != NULL); + _GLIBCXX_DEBUG_ASSERT(p_target_r->m_p_left != 0); p_target_r->m_p_left->m_p_parent = p_target_r; base_type::m_p_head->m_p_parent = p_target_r; @@ -90,19 +90,19 @@ split(const_key_reference r_key, PB_DS_CLASS_C_DEC& other) } node_pointer p_upper_bound = upper_bound(r_key).m_p_nd; - _GLIBCXX_DEBUG_ASSERT(p_upper_bound != NULL); + _GLIBCXX_DEBUG_ASSERT(p_upper_bound != 0); splay(p_upper_bound); _GLIBCXX_DEBUG_ASSERT(p_upper_bound->m_p_parent == this->m_p_head); node_pointer p_new_root = p_upper_bound->m_p_left; - _GLIBCXX_DEBUG_ASSERT(p_new_root != NULL); + _GLIBCXX_DEBUG_ASSERT(p_new_root != 0); base_type::m_p_head->m_p_parent = p_new_root; p_new_root->m_p_parent = base_type::m_p_head; other.m_p_head->m_p_parent = p_upper_bound; p_upper_bound->m_p_parent = other.m_p_head; - p_upper_bound->m_p_left = NULL; + p_upper_bound->m_p_left = 0; apply_update(p_upper_bound, (node_update* )this); base_type::split_finish(other); diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp index 4d2c45ce047..5a09f7c4020 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp @@ -52,7 +52,7 @@ copy_from_range(It first_it, It last_it) PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: thin_heap_() : - m_p_max(NULL) + m_p_max(0) { initialize(); _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -62,7 +62,7 @@ PB_DS_CLASS_T_DEC PB_DS_CLASS_C_DEC:: thin_heap_(const Cmp_Fn& r_cmp_fn) : PB_DS_BASE_C_DEC(r_cmp_fn), - m_p_max(NULL) + m_p_max(0) { initialize(); _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -75,7 +75,7 @@ thin_heap_(const PB_DS_CLASS_C_DEC& other) : { initialize(); m_p_max = base_type::m_p_root; - for (node_pointer p_nd = base_type::m_p_root; p_nd != NULL; p_nd = p_nd->m_p_next_sibling) + for (node_pointer p_nd = base_type::m_p_root; p_nd != 0; p_nd = p_nd->m_p_next_sibling) if (Cmp_Fn::operator()(m_p_max->m_value, p_nd->m_value)) m_p_max = p_nd; @@ -102,5 +102,5 @@ PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: initialize() -{ std::fill(m_a_aux, m_a_aux + max_rank, static_cast(NULL)); } +{ std::fill(m_a_aux, m_a_aux + max_rank, static_cast(0)); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp index f7abe35279c..0aedadb9f84 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp @@ -57,7 +57,7 @@ PB_DS_CLASS_C_DEC:: assert_aux_null() const { for (size_type i = 0; i < max_rank; ++i) - _GLIBCXX_DEBUG_ASSERT(m_a_aux[i] == NULL); + _GLIBCXX_DEBUG_ASSERT(m_a_aux[i] == 0); } PB_DS_CLASS_T_DEC @@ -65,15 +65,15 @@ void PB_DS_CLASS_C_DEC:: assert_max() const { - if (m_p_max == NULL) + if (m_p_max == 0) { _GLIBCXX_DEBUG_ASSERT(base_type::empty()); return; } _GLIBCXX_DEBUG_ASSERT(!base_type::empty()); - _GLIBCXX_DEBUG_ASSERT(base_type::parent(m_p_max) == NULL); - _GLIBCXX_DEBUG_ASSERT(m_p_max->m_p_prev_or_parent == NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::parent(m_p_max) == 0); + _GLIBCXX_DEBUG_ASSERT(m_p_max->m_p_prev_or_parent == 0); for (const_iterator it = base_type::begin(); it != base_type::end(); ++it) _GLIBCXX_DEBUG_ASSERT(!Cmp_Fn::operator()(m_p_max->m_value, it.m_p_nd->m_value)); } @@ -84,7 +84,7 @@ PB_DS_CLASS_C_DEC:: assert_node_consistent(const_node_pointer p_nd, bool root) const { base_type::assert_node_consistent(p_nd, root); - if (p_nd == NULL) + if (p_nd == 0) return; assert_node_consistent(p_nd->m_p_next_sibling, root); @@ -92,17 +92,17 @@ assert_node_consistent(const_node_pointer p_nd, bool root) const if (!root) { if (p_nd->m_metadata == 0) - _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling == NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_next_sibling == 0); else _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata == p_nd->m_p_next_sibling->m_metadata + 1); } - if (p_nd->m_p_l_child != NULL) + if (p_nd->m_p_l_child != 0) _GLIBCXX_DEBUG_ASSERT(p_nd->m_p_l_child->m_metadata + 1 == base_type::degree(p_nd)); - const bool unmarked_valid =(p_nd->m_p_l_child == NULL&& p_nd->m_metadata == 0) ||(p_nd->m_p_l_child != NULL&& p_nd->m_metadata == p_nd->m_p_l_child->m_metadata + 1); + const bool unmarked_valid =(p_nd->m_p_l_child == 0&& p_nd->m_metadata == 0) ||(p_nd->m_p_l_child != 0&& p_nd->m_metadata == p_nd->m_p_l_child->m_metadata + 1); - const bool marked_valid =(p_nd->m_p_l_child == NULL&& p_nd->m_metadata == 1) ||(p_nd->m_p_l_child != NULL&& p_nd->m_metadata == p_nd->m_p_l_child->m_metadata + 2); + const bool marked_valid =(p_nd->m_p_l_child == 0&& p_nd->m_metadata == 1) ||(p_nd->m_p_l_child != 0&& p_nd->m_metadata == p_nd->m_p_l_child->m_metadata + 2); _GLIBCXX_DEBUG_ASSERT(unmarked_valid || marked_valid); if (root) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp index 69afcd39f15..6f1b20b441a 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp @@ -46,7 +46,7 @@ pop() _GLIBCXX_DEBUG_ONLY(assert_valid();) _GLIBCXX_DEBUG_ASSERT(!base_type::empty()); - _GLIBCXX_DEBUG_ASSERT(m_p_max != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_max != 0); node_pointer p_nd = m_p_max; @@ -85,11 +85,11 @@ to_aux_except_max() p_add = m_p_max->m_p_l_child; - while (p_add != NULL) + while (p_add != 0) { node_pointer p_next_add = p_add->m_p_next_sibling; - p_add->m_metadata = p_add->m_p_l_child == NULL? + p_add->m_metadata = p_add->m_p_l_child == 0? 0 : p_add->m_p_l_child->m_metadata + 1; @@ -100,7 +100,7 @@ to_aux_except_max() p_add = m_p_max->m_p_next_sibling; - while (p_add != NULL) + while (p_add != 0) { node_pointer p_next_add = p_add->m_p_next_sibling; @@ -117,7 +117,7 @@ add_to_aux(node_pointer p_nd) { size_type r = p_nd->m_metadata; - while (m_a_aux[r] != NULL) + while (m_a_aux[r] != 0) { _GLIBCXX_DEBUG_ASSERT(p_nd->m_metadata < rank_bound()); @@ -130,7 +130,7 @@ add_to_aux(node_pointer p_nd) p_nd = m_a_aux[r]; } - m_a_aux[r] = NULL; + m_a_aux[r] = 0; ++r; } @@ -159,7 +159,7 @@ inline void PB_DS_CLASS_C_DEC:: make_from_aux() { - base_type::m_p_root = m_p_max = NULL; + base_type::m_p_root = m_p_max = 0; const size_type rnk_bnd = rank_bound(); @@ -167,11 +167,11 @@ make_from_aux() while (i < rnk_bnd) { - if (m_a_aux[i] != NULL) + if (m_a_aux[i] != 0) { make_root_and_link(m_a_aux[i]); - m_a_aux[i] = NULL; + m_a_aux[i] = 0; } ++i; @@ -186,7 +186,7 @@ PB_DS_CLASS_C_DEC:: remove_node(node_pointer p_nd) { node_pointer p_parent = p_nd; - while (base_type::parent(p_parent) != NULL) + while (base_type::parent(p_parent) != 0) p_parent = base_type::parent(p_parent); base_type::bubble_to_top(p_nd); @@ -194,10 +194,10 @@ remove_node(node_pointer p_nd) m_p_max = p_nd; node_pointer p_fix = base_type::m_p_root; - while (p_fix != NULL&& p_fix->m_p_next_sibling != p_parent) + while (p_fix != 0&& p_fix->m_p_next_sibling != p_parent) p_fix = p_fix->m_p_next_sibling; - if (p_fix != NULL) + if (p_fix != 0) p_fix->m_p_next_sibling = p_nd; remove_max_node(); @@ -210,7 +210,7 @@ clear() { base_type::clear(); - m_p_max = NULL; + m_p_max = 0; } PB_DS_CLASS_T_DEC @@ -251,7 +251,7 @@ erase_if(Pred pred) size_type ersd = 0; - while (p_out != NULL) + while (p_out != 0) { ++ersd; @@ -264,9 +264,9 @@ erase_if(Pred pred) node_pointer p_cur = base_type::m_p_root; - m_p_max = base_type::m_p_root = NULL; + m_p_max = base_type::m_p_root = 0; - while (p_cur != NULL) + while (p_cur != 0) { node_pointer p_next = p_cur->m_p_next_sibling; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp index 52407e6d0ae..700486a60d7 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp @@ -46,6 +46,6 @@ top() const _GLIBCXX_DEBUG_ONLY(assert_valid();) _GLIBCXX_DEBUG_ASSERT(!base_type::empty()); - _GLIBCXX_DEBUG_ASSERT(m_p_max != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_max != 0); return m_p_max->m_value; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp index 7a6952fdad4..4e8a1c2d8cc 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp @@ -49,11 +49,11 @@ push(const_reference r_val) p_nd->m_metadata = 0; - p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = NULL; + p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = 0; - if (base_type::m_p_root == NULL) + if (base_type::m_p_root == 0) { - p_nd->m_p_next_sibling = NULL; + p_nd->m_p_next_sibling = 0; m_p_max = base_type::m_p_root = p_nd; @@ -64,7 +64,7 @@ push(const_reference r_val) p_nd->m_p_next_sibling = base_type::m_p_root; - base_type::m_p_root->m_p_prev_or_parent = NULL; + base_type::m_p_root->m_p_prev_or_parent = 0; base_type::m_p_root = p_nd; @@ -81,7 +81,7 @@ PB_DS_CLASS_C_DEC:: make_root(node_pointer p_nd) { p_nd->m_metadata = - p_nd->m_p_l_child == NULL? + p_nd->m_p_l_child == 0? 0 : 1 + p_nd->m_p_l_child->m_metadata; } @@ -93,12 +93,12 @@ make_root_and_link(node_pointer p_nd) { make_root(p_nd); - p_nd->m_p_prev_or_parent = NULL; + p_nd->m_p_prev_or_parent = 0; p_nd->m_p_next_sibling = base_type::m_p_root; - if (base_type::m_p_root != NULL) - base_type::m_p_root->m_p_prev_or_parent = NULL; + if (base_type::m_p_root != 0) + base_type::m_p_root->m_p_prev_or_parent = 0; base_type::m_p_root = p_nd; @@ -112,15 +112,15 @@ fix(node_pointer p_y) { while (true) { - if (p_y->m_p_prev_or_parent == NULL) + if (p_y->m_p_prev_or_parent == 0) { fix_root(p_y); return; } - else if (p_y->m_metadata == 1&& p_y->m_p_next_sibling == NULL) + else if (p_y->m_metadata == 1&& p_y->m_p_next_sibling == 0) { - if (p_y->m_p_l_child != NULL) + if (p_y->m_p_l_child != 0) { fix_sibling_rank_1_unmarked(p_y); @@ -133,7 +133,7 @@ fix(node_pointer p_y) } else if (p_y->m_metadata > p_y->m_p_next_sibling->m_metadata + 1) { - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child != NULL); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child != 0); if (p_y->m_metadata != p_y->m_p_l_child->m_metadata + 2) { @@ -146,8 +146,8 @@ fix(node_pointer p_y) p_y = p_y->m_p_prev_or_parent; } - else if ((p_y->m_p_l_child == NULL&& - p_y->m_metadata == 2) ||(p_y->m_p_l_child != NULL&& + else if ((p_y->m_p_l_child == 0&& + p_y->m_metadata == 2) ||(p_y->m_p_l_child != 0&& p_y->m_metadata == p_y->m_p_l_child->m_metadata + 3)) { node_pointer p_z = p_y->m_p_prev_or_parent; @@ -166,7 +166,7 @@ inline void PB_DS_CLASS_C_DEC:: fix_root(node_pointer p_y) { - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent == NULL); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent == 0); make_root(p_y); @@ -178,18 +178,18 @@ inline void PB_DS_CLASS_C_DEC:: fix_sibling_rank_1_unmarked(node_pointer p_y) { - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0); _GLIBCXX_DEBUG_ONLY(node_pointer p_w = p_y->m_p_l_child;) - _GLIBCXX_DEBUG_ASSERT(p_w != NULL); - _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling == NULL); - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_next_sibling == NULL); + _GLIBCXX_DEBUG_ASSERT(p_w != 0); + _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling == 0); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_next_sibling == 0); p_y->m_p_next_sibling = p_y->m_p_l_child; p_y->m_p_next_sibling->m_p_prev_or_parent = p_y; - p_y->m_p_l_child = NULL; + p_y->m_p_l_child = 0; _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_y, false);) } @@ -199,8 +199,8 @@ inline void PB_DS_CLASS_C_DEC:: fix_sibling_rank_1_marked(node_pointer p_y) { - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL); - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child == NULL); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child == 0); p_y->m_metadata = 0; @@ -212,17 +212,17 @@ inline void PB_DS_CLASS_C_DEC:: fix_sibling_general_unmarked(node_pointer p_y) { - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0); node_pointer p_w = p_y->m_p_l_child; - _GLIBCXX_DEBUG_ASSERT(p_w != NULL); - _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != NULL); + _GLIBCXX_DEBUG_ASSERT(p_w != 0); + _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != 0); p_y->m_p_l_child = p_w->m_p_next_sibling; p_w->m_p_next_sibling->m_p_prev_or_parent = p_y; p_w->m_p_next_sibling = p_y->m_p_next_sibling; - _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != NULL); + _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != 0); p_w->m_p_next_sibling->m_p_prev_or_parent = p_w; p_y->m_p_next_sibling = p_w; @@ -236,7 +236,7 @@ inline void PB_DS_CLASS_C_DEC:: fix_sibling_general_marked(node_pointer p_y) { - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0); --p_y->m_metadata; @@ -248,9 +248,9 @@ inline void PB_DS_CLASS_C_DEC:: fix_child(node_pointer p_y) { - _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL); + _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0); - if (p_y->m_p_next_sibling != NULL) + if (p_y->m_p_next_sibling != 0) p_y->m_p_next_sibling->m_p_prev_or_parent = p_y->m_p_prev_or_parent; if (p_y->m_p_prev_or_parent->m_p_l_child == p_y) @@ -269,7 +269,7 @@ modify(point_iterator it, const_reference r_new_val) _GLIBCXX_DEBUG_ONLY(assert_valid();) node_pointer p_nd = it.m_p_nd; - _GLIBCXX_DEBUG_ASSERT(p_nd != NULL); + _GLIBCXX_DEBUG_ASSERT(p_nd != 0); const bool smaller = Cmp_Fn::operator()(r_new_val, p_nd->m_value); @@ -279,7 +279,7 @@ modify(point_iterator it, const_reference r_new_val) { remove_node(p_nd); - p_nd->m_p_l_child = NULL; + p_nd->m_p_l_child = 0; make_root_and_link(p_nd); @@ -288,7 +288,7 @@ modify(point_iterator it, const_reference r_new_val) return; } - if (p_nd->m_p_prev_or_parent == NULL) + if (p_nd->m_p_prev_or_parent == 0) { update_max(p_nd); @@ -298,9 +298,9 @@ modify(point_iterator it, const_reference r_new_val) } node_pointer p_y = p_nd->m_p_prev_or_parent; - _GLIBCXX_DEBUG_ASSERT(p_y != NULL); + _GLIBCXX_DEBUG_ASSERT(p_y != 0); - if (p_nd->m_p_next_sibling != NULL) + if (p_nd->m_p_next_sibling != 0) p_nd->m_p_next_sibling->m_p_prev_or_parent = p_y; if (p_y->m_p_l_child == p_nd) @@ -320,7 +320,7 @@ inline void PB_DS_CLASS_C_DEC:: update_max(node_pointer p_nd) { - if (m_p_max == NULL || Cmp_Fn::operator()(m_p_max->m_value, p_nd->m_value)) + if (m_p_max == 0 || Cmp_Fn::operator()(m_p_max->m_value, p_nd->m_value)) m_p_max = p_nd; } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp index 6acb7bd7571..85ebe4cb400 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp @@ -61,7 +61,7 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_out = base_type::prune(pred); - while (p_out != NULL) + while (p_out != 0) { _GLIBCXX_DEBUG_ASSERT(base_type::m_size > 0); --base_type::m_size; @@ -79,11 +79,11 @@ split(Pred pred, PB_DS_CLASS_C_DEC& other) node_pointer p_cur = base_type::m_p_root; - m_p_max = NULL; + m_p_max = 0; - base_type::m_p_root = NULL; + base_type::m_p_root = 0; - while (p_cur != NULL) + while (p_cur != 0) { node_pointer p_next = p_cur->m_p_next_sibling; @@ -106,7 +106,7 @@ join(PB_DS_CLASS_C_DEC& other) node_pointer p_other = other.m_p_root; - while (p_other != NULL) + while (p_other != 0) { node_pointer p_next = p_other->m_p_next_sibling; @@ -117,9 +117,9 @@ join(PB_DS_CLASS_C_DEC& other) base_type::m_size += other.m_size; - other.m_p_root = NULL; + other.m_p_root = 0; other.m_size = 0; - other.m_p_max = NULL; + other.m_p_max = 0; _GLIBCXX_DEBUG_ONLY(assert_valid();) _GLIBCXX_DEBUG_ONLY(other.assert_valid();) diff --git a/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp b/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp index 6ea68995e53..b8c19a587f8 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -56,7 +56,7 @@ class sample_tree_node_update public: // Metadata type. - typedef size_t metadata_type; + typedef std::size_t metadata_type; protected: diff --git a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp index 34fbe0cc3e2..2ecad89c9a7 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -48,7 +48,7 @@ class sample_trie_e_access_traits public: // Size type. - typedef size_t size_type; + typedef std::size_t size_type; // Key type. typedef std::string key_type; diff --git a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp index 55fd99787fb..8b2c6b591f7 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -56,7 +56,7 @@ class sample_trie_node_update public: // Metadata type. - typedef size_t metadata_type; + typedef std::size_t metadata_type; protected: diff --git a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp index 38d4eb1cfbc..71e26261794 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp @@ -74,7 +74,7 @@ public: inline const_iterator_() - : m_p_tbl(NULL) + : m_p_tbl(0) { } // Increments. diff --git a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp index bc0b2ad624a..5574b28e1e1 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp @@ -78,7 +78,7 @@ public: inline const_point_iterator_() - : m_p_value(NULL) + : m_p_value(0) { } // Copy constructor. @@ -99,7 +99,7 @@ public: inline const_pointer operator->() const { - _GLIBCXX_DEBUG_ASSERT(m_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_value != 0); return (m_p_value); } @@ -108,7 +108,7 @@ public: inline const_reference operator*() const { - _GLIBCXX_DEBUG_ASSERT(m_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_value != 0); return (*m_p_value); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/iterator.hpp index 3e21aba8bad..2836c17bea5 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/iterator.hpp @@ -74,7 +74,7 @@ public: inline iterator_() - : const_iterator_(NULL, PB_DS_GEN_POS(), NULL) + : const_iterator_(0, PB_DS_GEN_POS(), 0) { } // Conversion to a point-type iterator. @@ -97,7 +97,7 @@ public: inline pointer operator->() const { - _GLIBCXX_DEBUG_ASSERT(base_type::m_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::m_p_value != 0); return (const_cast(base_type::m_p_value)); } @@ -106,7 +106,7 @@ public: inline reference operator*() const { - _GLIBCXX_DEBUG_ASSERT(base_type::m_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(base_type::m_p_value != 0); return (const_cast(*base_type::m_p_value)); } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp index 37ce90069cf..c009106e0dd 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp @@ -72,7 +72,7 @@ public: inline point_iterator_() - : m_p_value(NULL) + : m_p_value(0) { } // Copy constructor. @@ -86,7 +86,7 @@ public: inline pointer operator->() const { - _GLIBCXX_DEBUG_ASSERT(m_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_value != 0); return (m_p_value); } @@ -95,7 +95,7 @@ public: inline reference operator*() const { - _GLIBCXX_DEBUG_ASSERT(m_p_value != NULL); + _GLIBCXX_DEBUG_ASSERT(m_p_value != 0); return (*m_p_value); } diff --git a/libstdc++-v3/include/ext/pb_ds/exception.hpp b/libstdc++-v3/include/ext/pb_ds/exception.hpp index 4f796b1ef33..b34e3ed26f2 100644 --- a/libstdc++-v3/include/ext/pb_ds/exception.hpp +++ b/libstdc++-v3/include/ext/pb_ds/exception.hpp @@ -1,6 +1,7 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -41,6 +42,7 @@ #ifndef PB_DS_EXCEPTION_HPP #define PB_DS_EXCEPTION_HPP +#include #include #include diff --git a/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp b/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp index 24c0c4562cc..f3bc86e9731 100644 --- a/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp +++ b/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -41,6 +41,7 @@ #ifndef PB_DS_HASH_POLICY_HPP #define PB_DS_HASH_POLICY_HPP +#include #include #include #include @@ -66,7 +67,7 @@ namespace __gnu_pbds #define PB_DS_CLASS_C_DEC linear_probe_fn // A probe sequence policy using fixed increments. - template + template class linear_probe_fn { public: @@ -90,7 +91,7 @@ namespace __gnu_pbds #define PB_DS_CLASS_C_DEC quadratic_probe_fn // A probe sequence policy using square increments. - template + template class quadratic_probe_fn { public: @@ -114,7 +115,7 @@ namespace __gnu_pbds #define PB_DS_CLASS_C_DEC direct_mask_range_hashing // A mask range-hashing class (uses a bit-mask). - template + template class direct_mask_range_hashing : public detail::mask_based_range_hashing { @@ -146,7 +147,7 @@ namespace __gnu_pbds #define PB_DS_CLASS_C_DEC direct_mod_range_hashing // A mod range-hashing class (uses the modulo function). - template + template class direct_mod_range_hashing : public detail::mod_based_range_hashing { @@ -180,7 +181,7 @@ namespace __gnu_pbds // A resize trigger policy based on a load check. It keeps the // load factor between some load factors load_min and load_max. - template + template class hash_load_check_resize_trigger : private PB_DS_SIZE_BASE_C_DEC { public: @@ -295,7 +296,7 @@ namespace __gnu_pbds // A resize trigger policy based on collision checks. It keeps the // simulated load factor lower than some given load factor. - template + template class cc_hash_max_collision_check_resize_trigger { public: @@ -396,7 +397,7 @@ namespace __gnu_pbds // A size policy whose sequence of sizes form an exponential // sequence (typically powers of 2. - template + template class hash_exponential_size_policy { public: @@ -438,7 +439,7 @@ namespace __gnu_pbds { public: // Size type. - typedef size_t 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 @@ -472,7 +473,7 @@ namespace __gnu_pbds template, typename Trigger_Policy = hash_load_check_resize_trigger<>, bool External_Size_Access = false, - typename Size_Type = size_t> + typename Size_Type = std::size_t> class hash_standard_resize_policy : public Size_Policy, public Trigger_Policy { diff --git a/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp b/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp index ec05b69c7e6..54a67c6e563 100644 --- a/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp +++ b/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp @@ -1,6 +1,7 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 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 @@ -41,6 +42,7 @@ #ifndef PB_DS_LU_POLICY_HPP #define PB_DS_LU_POLICY_HPP +#include #include #include @@ -87,12 +89,13 @@ namespace __gnu_pbds #undef PB_DS_CLASS_T_DEC #undef PB_DS_CLASS_C_DEC -#define PB_DS_CLASS_T_DEC template +#define PB_DS_CLASS_T_DEC template #define PB_DS_CLASS_C_DEC counter_lu_policy // A list-update policy that moves elements to the front of the list // based on the counter algorithm. - template > + template > class counter_lu_policy : private detail::counter_lu_policy_base { diff --git a/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp b/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp index 531f70c65ce..b6088e7d73a 100644 --- a/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp +++ b/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -41,6 +41,7 @@ #ifndef PB_DS_PRIORITY_QUEUE_HPP #define PB_DS_PRIORITY_QUEUE_HPP +#include #include #include #include @@ -53,10 +54,13 @@ namespace __gnu_pbds typename Tag = pairing_heap_tag, typename Allocator = std::allocator > class priority_queue - : public detail::priority_queue_base_dispatch::type + : public detail::priority_queue_base_dispatch::type { private: - typedef typename detail::priority_queue_base_dispatch::type base_type; + typedef typename + detail::priority_queue_base_dispatch::type base_type; public: typedef Value_Type value_type; diff --git a/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp b/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp index ccd2533cc4f..ef445336137 100644 --- a/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp +++ b/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 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 @@ -42,6 +42,7 @@ #ifndef PB_DS_TAG_AND_TRAIT_HPP #define PB_DS_TAG_AND_TRAIT_HPP +#include #include /** diff --git a/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp b/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp index 990860ec020..4af1adbde70 100644 --- a/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp +++ b/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -41,6 +41,7 @@ #ifndef PB_DS_TREE_POLICY_HPP #define PB_DS_TREE_POLICY_HPP +#include #include #include #include diff --git a/libstdc++-v3/include/ext/pb_ds/trie_policy.hpp b/libstdc++-v3/include/ext/pb_ds/trie_policy.hpp index c10591bb7f3..fc452104f75 100644 --- a/libstdc++-v3/include/ext/pb_ds/trie_policy.hpp +++ b/libstdc++-v3/include/ext/pb_ds/trie_policy.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 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 @@ -41,6 +41,7 @@ #ifndef PB_DS_TRIE_POLICY_HPP #define PB_DS_TRIE_POLICY_HPP +#include #include #include #include diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index a18b274fa88..dd18738dc57 100644 --- a/libstdc++-v3/include/ext/rc_string_base.h +++ b/libstdc++-v3/include/ext/rc_string_base.h @@ -554,7 +554,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // NB: Not required, but considered best practice. if (__is_null_pointer(__beg) && __beg != __end) std::__throw_logic_error(__N("__rc_string_base::" - "_S_construct NULL not valid")); + "_S_construct null not valid")); const size_type __dnew = static_cast(std::distance(__beg, __end)); diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h index b0500cf17e0..43d44528999 100644 --- a/libstdc++-v3/include/ext/sso_string_base.h +++ b/libstdc++-v3/include/ext/sso_string_base.h @@ -434,7 +434,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // 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")); + "_M_construct null not valid")); size_type __dnew = static_cast(std::distance(__beg, __end)); diff --git a/libstdc++-v3/include/ext/string_conversions.h b/libstdc++-v3/include/ext/string_conversions.h index 36c19e0a97a..a4276f30ba2 100644 --- a/libstdc++-v3/include/ext/string_conversions.h +++ b/libstdc++-v3/include/ext/string_conversions.h @@ -1,6 +1,6 @@ // String Conversions -*- C++ -*- -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -27,9 +27,9 @@ #pragma GCC system_header +#include #include #include -#include #include #include #include diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h index 70b197a705d..669d433e272 100644 --- a/libstdc++-v3/include/ext/throw_allocator.h +++ b/libstdc++-v3/include/ext/throw_allocator.h @@ -110,7 +110,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) void insert(void* p, size_t size) { - if (p == NULL) + if (!p) { std::string error("annotate_base::insert null insert!\n"); log_to_string(error, make_entry(p, size)); diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h index 1a8c3cb60a8..7bff97f7706 100644 --- a/libstdc++-v3/include/parallel/base.h +++ b/libstdc++-v3/include/parallel/base.h @@ -267,8 +267,8 @@ namespace __gnu_parallel /** @brief Similar to std::plus, but allows two different types. */ template(NULL) - + *static_cast<_Tp2*>(NULL))> + = __typeof__(*static_cast<_Tp1*>(0) + + *static_cast<_Tp2*>(0))> struct _Plus : public std::binary_function<_Tp1, _Tp2, _Result> { _Result @@ -283,8 +283,8 @@ namespace __gnu_parallel /** @brief Similar to std::multiplies, but allows two different types. */ template(NULL) - * *static_cast<_Tp2*>(NULL))> + = __typeof__(*static_cast<_Tp1*>(0) + * *static_cast<_Tp2*>(0))> struct _Multiplies : public std::binary_function<_Tp1, _Tp2, _Result> { _Result diff --git a/libstdc++-v3/include/parallel/basic_iterator.h b/libstdc++-v3/include/parallel/basic_iterator.h index c5c067a0b0d..a624edc1a3b 100644 --- a/libstdc++-v3/include/parallel/basic_iterator.h +++ b/libstdc++-v3/include/parallel/basic_iterator.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2007, 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 @@ -34,7 +34,6 @@ #define _GLIBCXX_PARALLEL_BASIC_ITERATOR_H 1 #include -#include #include #include #include diff --git a/libstdc++-v3/include/parallel/multiseq_selection.h b/libstdc++-v3/include/parallel/multiseq_selection.h index 1fab257ccdd..e77653aeefa 100644 --- a/libstdc++-v3/include/parallel/multiseq_selection.h +++ b/libstdc++-v3/include/parallel/multiseq_selection.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +// 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 @@ -230,7 +230,7 @@ namespace __gnu_parallel __n /= 2; _SeqNumber __lmax_seq = -1; // to avoid warning - const _ValueType* __lmax = NULL; // impossible to avoid the warning? + const _ValueType* __lmax = 0; // impossible to avoid the warning? for (_SeqNumber __i = 0; __i < __m; __i++) { if (__a[__i] > 0) @@ -332,8 +332,8 @@ namespace __gnu_parallel // Compare the keys on both edges of the border. // Maximum of left edge, minimum of right edge. - _ValueType* __maxleft = NULL; - _ValueType* __minright = NULL; + _ValueType* __maxleft = 0; + _ValueType* __minright = 0; for (_SeqNumber __i = 0; __i < __m; __i++) { if (__a[__i] > 0) @@ -482,7 +482,7 @@ namespace __gnu_parallel { __n /= 2; - const _Tp* __lmax = NULL; + const _Tp* __lmax = 0; for (_SeqNumber __i = 0; __i < __m; ++__i) { if (__a[__i] > 0) diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h index 445184ae5ec..1baf76beb9c 100644 --- a/libstdc++-v3/include/parallel/multiway_merge.h +++ b/libstdc++-v3/include/parallel/multiway_merge.h @@ -502,11 +502,11 @@ namespace __gnu_parallel _LT __lt(__k, __comp); // Default value for potentially non-default-constructible types. - _ValueType* __arbitrary_element = NULL; + _ValueType* __arbitrary_element = 0; for (_SeqNumber __t = 0; __t < __k; ++__t) { - if(__arbitrary_element == NULL + if(!__arbitrary_element && _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__t]) > 0) __arbitrary_element = &(*__seqs_begin[__t].first); } diff --git a/libstdc++-v3/include/parallel/multiway_mergesort.h b/libstdc++-v3/include/parallel/multiway_mergesort.h index 85894719dc0..8e2c53ec661 100644 --- a/libstdc++-v3/include/parallel/multiway_mergesort.h +++ b/libstdc++-v3/include/parallel/multiway_mergesort.h @@ -434,7 +434,7 @@ namespace __gnu_parallel (::operator new(__size * sizeof(_ValueType))); } else - __sd._M_samples = NULL; + __sd._M_samples = 0; __sd._M_offsets = new _DifferenceType[__num_threads - 1]; __sd._M_pieces diff --git a/libstdc++-v3/include/parallel/partition.h b/libstdc++-v3/include/parallel/partition.h index 0d5a139968c..27b3871f41b 100644 --- a/libstdc++-v3/include/parallel/partition.h +++ b/libstdc++-v3/include/parallel/partition.h @@ -73,7 +73,7 @@ namespace __gnu_parallel __leftnew, __rightnew; // just 0 or 1, but int to allow atomic operations - int* __reserved_left = NULL, * __reserved_right = NULL; + int* __reserved_left = 0, * __reserved_right = 0; _DifferenceType __chunk_size = __s.partition_chunk_size; diff --git a/libstdc++-v3/include/profile/impl/profiler_node.h b/libstdc++-v3/include/profile/impl/profiler_node.h index 77654a8f813..97bb061300a 100644 --- a/libstdc++-v3/include/profile/impl/profiler_node.h +++ b/libstdc++-v3/include/profile/impl/profiler_node.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -65,14 +65,14 @@ inline __stack_t __get_stack() #if defined _GLIBCXX_HAVE_EXECINFO_H size_t __max_depth = __stack_max_depth(); if (__max_depth == 0) - return NULL; + return 0; __stack_npt __buffer(__max_depth); int __depth = backtrace(&__buffer[0], __max_depth); __stack_t __stack = new __stack_npt(__depth); memcpy(&(*__stack)[0], &__buffer[0], __depth * sizeof(__object_t)); return __stack; #else - return NULL; + return 0; #endif } diff --git a/libstdc++-v3/include/profile/impl/profiler_trace.h b/libstdc++-v3/include/profile/impl/profiler_trace.h index bfa8a6c3b21..19a2a8273ef 100644 --- a/libstdc++-v3/include/profile/impl/profiler_trace.h +++ b/libstdc++-v3/include/profile/impl/profiler_trace.h @@ -87,8 +87,8 @@ struct __warning_data const char* __warning_id; const char* __warning_message; __warning_data() - : __magnitude(0.0), __context(NULL), __warning_id(NULL), - __warning_message(NULL) { } + : __magnitude(0.0), __context(0), __warning_id(0), + __warning_message(0) { } __warning_data(float __m, __stack_t __c, const char* __id, const char* __msg) : __magnitude(__m), __context(__c), __warning_id(__id), @@ -141,13 +141,13 @@ struct __cost_factor typedef std::_GLIBCXX_STD_PR::vector<__cost_factor*> __cost_factor_vector; -_GLIBCXX_PROFILE_DEFINE_DATA(__trace_hash_func*, _S_hash_func, NULL); -_GLIBCXX_PROFILE_DEFINE_DATA(__trace_hashtable_size*, _S_hashtable_size, NULL); -_GLIBCXX_PROFILE_DEFINE_DATA(__trace_map2umap*, _S_map2umap, NULL); -_GLIBCXX_PROFILE_DEFINE_DATA(__trace_vector_size*, _S_vector_size, NULL); -_GLIBCXX_PROFILE_DEFINE_DATA(__trace_vector_to_list*, _S_vector_to_list, NULL); -_GLIBCXX_PROFILE_DEFINE_DATA(__trace_list_to_slist*, _S_list_to_slist, NULL); -_GLIBCXX_PROFILE_DEFINE_DATA(__trace_list_to_vector*, _S_list_to_vector, NULL); +_GLIBCXX_PROFILE_DEFINE_DATA(__trace_hash_func*, _S_hash_func, 0); +_GLIBCXX_PROFILE_DEFINE_DATA(__trace_hashtable_size*, _S_hashtable_size, 0); +_GLIBCXX_PROFILE_DEFINE_DATA(__trace_map2umap*, _S_map2umap, 0); +_GLIBCXX_PROFILE_DEFINE_DATA(__trace_vector_size*, _S_vector_size, 0); +_GLIBCXX_PROFILE_DEFINE_DATA(__trace_vector_to_list*, _S_vector_to_list, 0); +_GLIBCXX_PROFILE_DEFINE_DATA(__trace_list_to_slist*, _S_list_to_slist, 0); +_GLIBCXX_PROFILE_DEFINE_DATA(__trace_list_to_vector*, _S_list_to_vector, 0); _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __vector_shift_cost_factor, {"__vector_shift_cost_factor", 1.0}); @@ -177,7 +177,7 @@ _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __umap_find_cost_factor, {"__umap_find_cost_factor", 10.0}); _GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor, __umap_iterate_cost_factor, {"__umap_iterate_cost_factor", 1.7}); -_GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor_vector*, __cost_factors, NULL); +_GLIBCXX_PROFILE_DEFINE_DATA(__cost_factor_vector*, __cost_factors, 0); _GLIBCXX_PROFILE_DEFINE_DATA(const char*, _S_trace_file_name, _GLIBCXX_PROFILE_TRACE_PATH_ROOT); @@ -249,7 +249,7 @@ __trace_base<__object_info, __stack_info>::__trace_base() __object_table.rehash(10000); __stack_table.rehash(10000); __stack_table_byte_size = 0; - __id = NULL; + __id = 0; } template @@ -277,7 +277,7 @@ __object_info* __trace_base<__object_info, __stack_info>::__get_object_info( __object_table.find(__object); if (__object_it == __object_table.end()){ this->__object_table_lock.unlock(); - return NULL; + return 0; } else { this->__object_table_lock.unlock(); return &__object_it->second; @@ -336,7 +336,7 @@ inline size_t __env_to_size_t(const char* __env_var, size_t __default_value) { char* __env_value = getenv(__env_var); if (__env_value) { - long int __converted_value = strtol(__env_value, NULL, 10); + long int __converted_value = strtol(__env_value, 0, 10); if (errno || __converted_value < 0) { fprintf(stderr, "Bad value for environment variable '%s'.\n", __env_var); abort(); diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 5ef52f3763f..d4f685ced54 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -38,8 +38,8 @@ # include #endif +#include #include -#include _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index b23b51a78fe..32ca0917062 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -45,7 +45,6 @@ #pragma GCC system_header -#include // For size_t #include #include // For invalid_argument, out_of_range, // overflow_error diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index 9aa4f1ab10f..00690bee938 100644 --- a/libstdc++-v3/include/std/fstream +++ b/libstdc++-v3/include/std/fstream @@ -397,7 +397,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) if (__testout && __off == 0 && _M_buf_size > 1 ) this->setp(_M_buf, _M_buf + _M_buf_size - 1); else - this->setp(NULL, NULL); + this->setp(0, 0); } }; @@ -795,7 +795,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) explicit basic_fstream(const char* __s, ios_base::openmode __mode = ios_base::in | ios_base::out) - : __iostream_type(NULL), _M_filebuf() + : __iostream_type(0), _M_filebuf() { this->init(&_M_filebuf); this->open(__s, __mode); @@ -810,7 +810,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) explicit basic_fstream(const std::string& __s, ios_base::openmode __mode = ios_base::in | ios_base::out) - : __iostream_type(NULL), _M_filebuf() + : __iostream_type(0), _M_filebuf() { this->init(&_M_filebuf); this->open(__s, __mode); diff --git a/libstdc++-v3/include/std/iterator b/libstdc++-v3/include/std/iterator index a15bdf9744c..5395106ae6a 100644 --- a/libstdc++-v3/include/std/iterator +++ b/libstdc++-v3/include/std/iterator @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 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 @@ -58,7 +58,6 @@ #pragma GCC system_header #include -#include #include #include #include diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index be435cd38e5..b236f0db91d 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -37,7 +37,6 @@ #else #include -#include #include #include #include diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread index 470f2c0f35c..c348c76bc40 100644 --- a/libstdc++-v3/include/std/thread +++ b/libstdc++-v3/include/std/thread @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 9831851c4a5..3253f419645 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -39,7 +39,7 @@ # error C++0x header cannot be included from TR1 header #endif -#include +#include #if defined(_GLIBCXX_INCLUDE_AS_CXX0X) # include diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index fa92751791d..f15ac92b0bf 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -1,7 +1,7 @@ // The template and inlines for the -*- C++ -*- valarray class. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -36,7 +36,6 @@ #pragma GCC system_header #include -#include #include #include #include diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits index fe28f84785a..33083ff9c73 100644 --- a/libstdc++-v3/include/tr1/type_traits +++ b/libstdc++-v3/include/tr1/type_traits @@ -1,6 +1,7 @@ // TR1 type_traits -*- C++ -*- -// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -35,7 +36,7 @@ # error TR1 header cannot be included from C++0x header #endif -#include +#include #if defined(_GLIBCXX_INCLUDE_AS_TR1) # include diff --git a/libstdc++-v3/libsupc++/initializer_list b/libstdc++-v3/libsupc++/initializer_list index 3810706d47e..f4a8f864259 100644 --- a/libstdc++-v3/libsupc++/initializer_list +++ b/libstdc++-v3/libsupc++/initializer_list @@ -36,7 +36,7 @@ #pragma GCC visibility push(default) -#include +#include namespace std { @@ -61,7 +61,7 @@ namespace std : _M_array(__a), _M_len(__l) { } public: - initializer_list() : _M_array(NULL), _M_len(0) { } + initializer_list() : _M_array(0), _M_len(0) { } // Number of elements. size_type diff --git a/libstdc++-v3/libsupc++/new b/libstdc++-v3/libsupc++/new index 7b515311cab..80ee3ba0fd8 100644 --- a/libstdc++-v3/libsupc++/new +++ b/libstdc++-v3/libsupc++/new @@ -38,7 +38,7 @@ #pragma GCC system_header -#include +#include #include #pragma GCC visibility push(default) diff --git a/libstdc++-v3/src/chrono.cc b/libstdc++-v3/src/chrono.cc index 422b97399ac..6d7a64d0080 100644 --- a/libstdc++-v3/src/chrono.cc +++ b/libstdc++-v3/src/chrono.cc @@ -1,6 +1,6 @@ // chrono -*- C++ -*- -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -51,7 +51,7 @@ namespace std #elif defined(_GLIBCXX_USE_GETTIMEOFDAY) timeval tv; // EINVAL, EFAULT - gettimeofday(&tv, NULL); + gettimeofday(&tv, 0); return time_point(duration(chrono::seconds(tv.tv_sec) + chrono::microseconds(tv.tv_usec))); #else diff --git a/libstdc++-v3/src/condition_variable.cc b/libstdc++-v3/src/condition_variable.cc index fdcb6a04b38..d3f29f657f4 100644 --- a/libstdc++-v3/src/condition_variable.cc +++ b/libstdc++-v3/src/condition_variable.cc @@ -1,6 +1,6 @@ // condition_variable -*- C++ -*- -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -34,7 +34,7 @@ namespace std __native_type __tmp = __GTHREAD_COND_INIT; _M_cond = __tmp; #else - int __e = __gthread_cond_init(&_M_cond, NULL); + int __e = __gthread_cond_init(&_M_cond, 0); if (__e) __throw_system_error(__e); diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc index 5ee8258ccb8..1dc1d6891c6 100644 --- a/libstdc++-v3/src/localename.cc +++ b/libstdc++-v3/src/localename.cc @@ -137,7 +137,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } } else - __throw_runtime_error(__N("locale::locale NULL not valid")); + __throw_runtime_error(__N("locale::locale null not valid")); } locale::locale(const locale& __base, const char* __s, category __cat) diff --git a/libstdc++-v3/src/mt_allocator.cc b/libstdc++-v3/src/mt_allocator.cc index 9c3af0e60d5..b04fe5b05e4 100644 --- a/libstdc++-v3/src/mt_allocator.cc +++ b/libstdc++-v3/src/mt_allocator.cc @@ -1,6 +1,6 @@ // Allocator details. -// Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 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 @@ -150,7 +150,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __block->_M_next = reinterpret_cast<_Block_record*>(__c); __block = __block->_M_next; } - __block->_M_next = NULL; + __block->_M_next = 0; __block = __bin._M_first[__thread_id]; __bin._M_first[__thread_id] = __block->_M_next; @@ -206,8 +206,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _Bin_record& __bin = _M_bin[__n]; __v = ::operator new(sizeof(_Block_record*)); __bin._M_first = static_cast<_Block_record**>(__v); - __bin._M_first[0] = NULL; - __bin._M_address = NULL; + __bin._M_first[0] = 0; + __bin._M_address = 0; } _M_init = true; } @@ -362,7 +362,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // blocks on global list (and if not add new ones) and // get the first one. _Bin_record& __bin = _M_bin[__which]; - _Block_record* __block = NULL; + _Block_record* __block = 0; if (__gthread_active_p()) { // Resync the _M_used counters. @@ -374,7 +374,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __atomic_add(&__reclaimed_base[__thread_id], -__reclaimed); __gthread_mutex_lock(__bin._M_mutex); - if (__bin._M_first[0] == NULL) + if (__bin._M_first[0] == 0) { void* __v = ::operator new(__options._M_chunk_size); _Block_address* __address = static_cast<_Block_address*>(__v); @@ -395,7 +395,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __block->_M_next = reinterpret_cast<_Block_record*>(__c); __block = __block->_M_next; } - __block->_M_next = NULL; + __block->_M_next = 0; } else { @@ -407,7 +407,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { __bin._M_free[__thread_id] = __bin._M_free[0]; __bin._M_free[0] = 0; - __bin._M_first[0] = NULL; + __bin._M_first[0] = 0; } else { @@ -417,7 +417,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) while (--__block_count > 0) __block = __block->_M_next; __bin._M_first[0] = __block->_M_next; - __block->_M_next = NULL; + __block->_M_next = 0; } __gthread_mutex_unlock(__bin._M_mutex); } @@ -439,7 +439,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __block->_M_next = reinterpret_cast<_Block_record*>(__c); __block = __block->_M_next; } - __block->_M_next = NULL; + __block->_M_next = 0; } __block = __bin._M_first[__thread_id]; @@ -527,7 +527,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) } // Set last record. - _M_thread_freelist[__i - 1]._M_next = NULL; + _M_thread_freelist[__i - 1]._M_next = 0; _M_thread_freelist[__i - 1]._M_id = __i; if (!freelist._M_thread_freelist_array) @@ -572,7 +572,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) std::memset(__v, 0, sizeof(_Block_record*) * __max_threads); __bin._M_first = static_cast<_Block_record**>(__v); - __bin._M_address = NULL; + __bin._M_address = 0; __v = ::operator new(sizeof(size_t) * __max_threads); std::memset(__v, 0, sizeof(size_t) * __max_threads); @@ -606,8 +606,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _Bin_record& __bin = _M_bin[__n]; __v = ::operator new(sizeof(_Block_record*)); __bin._M_first = static_cast<_Block_record**>(__v); - __bin._M_first[0] = NULL; - __bin._M_address = NULL; + __bin._M_first[0] = 0; + __bin._M_address = 0; } } _M_init = true; @@ -722,7 +722,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) } // Set last record. - _M_thread_freelist[__i - 1]._M_next = NULL; + _M_thread_freelist[__i - 1]._M_next = 0; _M_thread_freelist[__i - 1]._M_id = __i; if (!freelist._M_thread_freelist_array) @@ -767,7 +767,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) std::memset(__v, 0, sizeof(_Block_record*) * __max_threads); __bin._M_first = static_cast<_Block_record**>(__v); - __bin._M_address = NULL; + __bin._M_address = 0; __v = ::operator new(sizeof(size_t) * __max_threads); std::memset(__v, 0, sizeof(size_t) * __max_threads); @@ -800,8 +800,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _Bin_record& __bin = _M_bin[__n]; __v = ::operator new(sizeof(_Block_record*)); __bin._M_first = static_cast<_Block_record**>(__v); - __bin._M_first[0] = NULL; - __bin._M_address = NULL; + __bin._M_first[0] = 0; + __bin._M_address = 0; } } _M_init = true; diff --git a/libstdc++-v3/src/thread.cc b/libstdc++-v3/src/thread.cc index 879e864edd4..2ea6a490735 100644 --- a/libstdc++-v3/src/thread.cc +++ b/libstdc++-v3/src/thread.cc @@ -1,6 +1,6 @@ // thread -*- C++ -*- -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -58,7 +58,7 @@ namespace std int __e = EINVAL; if (_M_id != id()) - __e = __gthread_join(_M_id._M_thread, NULL); + __e = __gthread_join(_M_id._M_thread, 0); if (__e) __throw_system_error(__e); diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c b/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c index 9e621c3f786..f6c623043cd 100644 --- a/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c +++ b/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c @@ -1,7 +1,7 @@ // { dg-require-sharedlib "" } // { dg-options "-g -O2 -pthread -ldl -x c" { target *-*-linux* } } -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -32,20 +32,20 @@ static void* run(void* arg) void (*cb)(); lib = dlopen("./testsuite_shared.so", RTLD_NOW); - if (lib == NULL) + if (!lib) { printf("dlopen failed: %s\n", strerror(errno)); - return NULL; + return 0; } cb = (function_type) dlsym(lib, "try_throw_exception"); - if (cb == NULL) + if (!cb) { printf("dlsym failed: %s\n", strerror(errno)); - return NULL; + return 0; } cb(); dlclose(lib); - return NULL; + return 0; } // libstdc++/23591 @@ -53,9 +53,9 @@ int main(void) { pthread_t pt; - if (pthread_create(&pt, NULL, &run, NULL) != 0) + if (pthread_create(&pt, 0, &run, 0) != 0) return 1; - if (pthread_join(pt, NULL) != 0) + if (pthread_join(pt, 0) != 0) return 1; return 0; diff --git a/libstdc++-v3/testsuite/18_support/new_delete_placement.cc b/libstdc++-v3/testsuite/18_support/new_delete_placement.cc index ef845d3a391..866a89b79cb 100644 --- a/libstdc++-v3/testsuite/18_support/new_delete_placement.cc +++ b/libstdc++-v3/testsuite/18_support/new_delete_placement.cc @@ -1,6 +1,6 @@ // 2002-07-24 Benjamin Kosnik -// Copyright (C) 2002, 2004, 2009 Free Software Foundation +// Copyright (C) 2002, 2004, 2009, 2010 Free Software Foundation // // 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 @@ -27,7 +27,7 @@ void test01() { void* pc = new char; void* pa = new char[10]; - void* tmp = NULL; + void* tmp = 0; operator delete(pc, tmp); operator delete[](pa, tmp); } diff --git a/libstdc++-v3/testsuite/18_support/pthread_guard.cc b/libstdc++-v3/testsuite/18_support/pthread_guard.cc index 965328ebcba..5389316bab0 100644 --- a/libstdc++-v3/testsuite/18_support/pthread_guard.cc +++ b/libstdc++-v3/testsuite/18_support/pthread_guard.cc @@ -1,5 +1,5 @@ // -// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +// 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 @@ -40,7 +40,7 @@ void* do_something (void *arg) { static int bar __attribute__((unused)) = get_bar (); - return NULL; + return 0; } int @@ -48,10 +48,10 @@ get_foo (void) { pthread_t new_thread; - if (pthread_create (&new_thread, NULL, do_something, NULL) != 0) + if (pthread_create (&new_thread, 0, do_something, 0) != 0) std::abort (); - if (pthread_join (new_thread, NULL) != 0) + if (pthread_join (new_thread, 0) != 0) std::abort (); return 1; diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc index 73839d26c22..5652478f42b 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc @@ -1,6 +1,6 @@ // 1999-06-04 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,7 +33,7 @@ void test05() std::string empty2(empty.begin(), empty.end()); // libstdc++/8716 (same underlying situation, same fix) - char const * s = NULL; + char const * s = 0; std::string zero_length_built_with_NULL(s,0); } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc index 4fe58b6aced..e72377de66a 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc @@ -1,6 +1,6 @@ // 1999-06-04 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,7 +33,7 @@ void test05() std::wstring empty2(empty.begin(), empty.end()); // libstdc++/8716 (same underlying situation, same fix) - wchar_t const * s = NULL; + wchar_t const * s = 0; std::wstring zero_length_built_with_NULL(s,0); } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/char/1.cc index c39f6b416f7..de0fe168e98 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/char/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/char/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 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 @@ -29,7 +29,7 @@ int test01(void) // data() for size == 0 is non-NULL. VERIFY( empty.size() == 0 ); const std::string::value_type* p = empty.data(); - VERIFY( p != NULL ); + VERIFY( p ); return 0; } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/wchar_t/1.cc index 1ddde927227..a57464aa5b5 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 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 @@ -29,7 +29,7 @@ int test01(void) // data() for size == 0 is non-NULL. VERIFY( empty.size() == 0 ); const std::wstring::value_type* p = empty.data(); - VERIFY( p != NULL ); + VERIFY( p ); return 0; } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc index fb48898d696..b3dc9b20e7c 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc @@ -2,7 +2,7 @@ // Adapted from http://gcc.gnu.org/ml/gcc-bugs/2002-01/msg00679.html // which was adapted from pthread1.cc by Mike Lu // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -95,12 +95,12 @@ main (void) #endif pthread_t prod; - pthread_create (&prod, NULL, produce, NULL); + pthread_create (&prod, 0, produce, 0); pthread_t cons; - pthread_create (&cons, NULL, consume, NULL); + pthread_create (&cons, 0, consume, 0); - pthread_join (prod, NULL); - pthread_join (cons, NULL); + pthread_join (prod, 0); + pthread_join (cons, 0); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc index 4a96797bf52..2df9553a35d 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003, 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 @@ -84,8 +85,8 @@ void test01() std::ctype_base::mask m01[3]; std::ctype_base::mask m02[13]; const char_type* cc0 = strlit00; - const char_type* cc1 = NULL; - const char_type* cc2 = NULL; + const char_type* cc1 = 0; + const char_type* cc2 = 0; cc0 = strlit00; for (std::size_t i = 0; i < 3; ++i) diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc index cf2f845ca3b..0b989cbe729 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003, 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 @@ -84,8 +85,8 @@ void test01() std::ctype_base::mask m01[3]; std::ctype_base::mask m02[13]; const char_type* cc0 = strlit00; - const char_type* cc1 = NULL; - const char_type* cc2 = NULL; + const char_type* cc1 = 0; + const char_type* cc2 = 0; cc0 = strlit00; for (std::size_t i = 0; i < 3; ++i) diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc index d7ad84137da..f36559ea27c 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc @@ -3,7 +3,7 @@ // { dg-options "-pthreads" { target *-*-solaris* } } // { dg-require-namedlocale "" } -// Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation // // 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 @@ -59,10 +59,10 @@ main() pthread_t tid[max_thread_count]; for (int i = 0; i < max_thread_count; i++) - pthread_create (&tid[i], NULL, thread_main, 0); + pthread_create (&tid[i], 0, thread_main, 0); for (int i = 0; i < max_thread_count; i++) - pthread_join (tid[i], NULL); + pthread_join (tid[i], 0); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc index c5c70dcc9d7..c09b000130e 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc @@ -2,7 +2,8 @@ // 2000-09-13 Benjamin Kosnik -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +// 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -96,7 +97,7 @@ void test01() VERIFY( loc07 != loc02 ); VERIFY( loc07.name() != "" ); try - { locale loc08(static_cast(NULL)); } + { locale loc08(static_cast(0)); } catch(runtime_error& obj) { VERIFY( true ); } catch(...) @@ -130,7 +131,7 @@ void test01() VERIFY( loc11 == loc01 ); try - { locale loc12(loc01, static_cast(NULL), locale::ctype); } + { locale loc12(loc01, static_cast(0), locale::ctype); } catch(runtime_error& obj) { VERIFY( true ); } catch(...) @@ -178,7 +179,7 @@ void test01() VERIFY( loc11 == loc01 ); try - { locale loc12(loc01, static_cast(NULL), locale::ctype); } + { locale loc12(loc01, static_cast(0), locale::ctype); } catch(runtime_error& obj) { VERIFY( true ); } catch(...) diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc index 428efc952b6..6693f5d2d6d 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 Free Software Foundation // // 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 @@ -36,7 +36,7 @@ void test01() "LC_PAPER=C;LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;" "LC_MEASUREMENT=C;LC_IDENTIFICATION=C" ); - VERIFY( locale().name() == setlocale(LC_ALL, NULL) ); + VERIFY( locale().name() == setlocale(LC_ALL, 0) ); locale loc1 = locale(locale::classic(), "en_US.UTF-8", locale::time); diff --git a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc index 4927e5647a1..30e133fd49a 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc @@ -2,7 +2,7 @@ // 2004-02-09 Petur Runolfsson -// Copyright (C) 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2009, 2010 Free Software Foundation // // 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 @@ -39,7 +39,7 @@ void test01() if (loc.name() != "*") { locale::global(loc); - VERIFY( loc.name() == setlocale(LC_ALL, NULL) ); + VERIFY( loc.name() == setlocale(LC_ALL, 0) ); } } diff --git a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc index 21d52fd4b2e..3265f71a29c 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc @@ -2,7 +2,7 @@ // 2000-09-13 Benjamin Kosnik -// Copyright (C) 2000, 2002, 2003, 2005, 2009 Free Software Foundation +// Copyright (C) 2000, 2002, 2003, 2005, 2009, 2010 Free Software Foundation // // 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 @@ -33,7 +33,7 @@ void test02() const string ph("en_PH"); const string mx("es_MX"); - const char* orig = setlocale(LC_ALL, NULL); + const char* orig = setlocale(LC_ALL, 0); const char* testph = setlocale(LC_ALL, ph.c_str()); const char* testmx = setlocale(LC_ALL, mx.c_str()); setlocale(LC_ALL, orig); @@ -54,7 +54,7 @@ void test02() // Change global locale. locale global_orig = locale::global(loc_mx); - const char* lc_all_mx = setlocale(LC_ALL, NULL); + const char* lc_all_mx = setlocale(LC_ALL, 0); if (lc_all_mx) { VERIFY( mx == lc_all_mx ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc index 7de5471495f..3c6ad92e483 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 Free Software Foundation // // 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 @@ -47,7 +47,7 @@ void test01() bool test __attribute__((unused)) = true; ostringstream stream; - time_t tt = time(NULL); + time_t tt = time(0); const char* fmt = "%c"; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc index 54d4cde7cef..3d19d36c20b 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 Free Software Foundation // // 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 @@ -46,7 +46,7 @@ void test03() bool test __attribute__((unused)) = true; ostringstream stream; - time_t tt = time(NULL); + time_t tt = time(0); const char* fmt = "%c"; diff --git a/libstdc++-v3/testsuite/23_containers/list/23781.cc b/libstdc++-v3/testsuite/23_containers/list/23781.cc index ca275bda5ad..7b291df798a 100644 --- a/libstdc++-v3/testsuite/23_containers/list/23781.cc +++ b/libstdc++-v3/testsuite/23_containers/list/23781.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include typedef std::list list_type; list_type::iterator it = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/23_containers/list/pthread1.cc b/libstdc++-v3/testsuite/23_containers/list/pthread1.cc index fcbb039dce3..7a1de4d6607 100644 --- a/libstdc++-v3/testsuite/23_containers/list/pthread1.cc +++ b/libstdc++-v3/testsuite/23_containers/list/pthread1.cc @@ -1,6 +1,6 @@ // 2002-01-23 Loren J. Rittle // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -31,6 +31,7 @@ #include #include +#include #include const int thread_cycles = 10; diff --git a/libstdc++-v3/testsuite/23_containers/map/23781.cc b/libstdc++-v3/testsuite/23_containers/map/23781.cc index f7967693f79..e282c754667 100644 --- a/libstdc++-v3/testsuite/23_containers/map/23781.cc +++ b/libstdc++-v3/testsuite/23_containers/map/23781.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::map::iterator it = NULL; // { dg-error "conversion" } std::map::const_iterator cit = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/23_containers/map/pthread6.cc b/libstdc++-v3/testsuite/23_containers/map/pthread6.cc index 608527e8f08..8680ebbcc44 100644 --- a/libstdc++-v3/testsuite/23_containers/map/pthread6.cc +++ b/libstdc++-v3/testsuite/23_containers/map/pthread6.cc @@ -1,7 +1,7 @@ // 2002-01-23 Loren J. Rittle // Adpated from libstdc++/5444 submitted by markus.breuer@materna.de // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -26,6 +26,7 @@ #include #include #include +#include #include const int max_thread_count = 8; diff --git a/libstdc++-v3/testsuite/23_containers/multimap/23781.cc b/libstdc++-v3/testsuite/23_containers/multimap/23781.cc index 912bb926b98..50ec929064e 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/23781.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/23781.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::multimap::iterator it = NULL; // { dg-error "conversion" } std::multimap::const_iterator cit = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/23_containers/multiset/23781.cc b/libstdc++-v3/testsuite/23_containers/multiset/23781.cc index 80d13370345..6b0bacf955b 100644 --- a/libstdc++-v3/testsuite/23_containers/multiset/23781.cc +++ b/libstdc++-v3/testsuite/23_containers/multiset/23781.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::multiset::iterator it = NULL; // { dg-error "conversion" } std::multiset::const_iterator cit = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/23_containers/set/23781.cc b/libstdc++-v3/testsuite/23_containers/set/23781.cc index 7a2a2bc7240..b47b748ec8d 100644 --- a/libstdc++-v3/testsuite/23_containers/set/23781.cc +++ b/libstdc++-v3/testsuite/23_containers/set/23781.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::set::iterator it = NULL; // { dg-error "conversion" } std::set::const_iterator cit = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc b/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc index 36d8adde348..0b86efacb92 100644 --- a/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc +++ b/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc @@ -1,6 +1,6 @@ // 2001-04-30 Benjamin Kosnik -// Copyright (C) 2001, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2003, 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 @@ -49,7 +49,7 @@ bool test02(void) *ostrb_it01; VERIFY( !ostrb_it01.failed() ); - costreambuf_iter ostrb_it02(NULL); + costreambuf_iter ostrb_it02(0); VERIFY( ostrb_it02.failed() ); ostrb_it02++; ++ostrb_it02; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc index 6dc56f9b154..0a12e722450 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 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 @@ -61,19 +61,19 @@ void test_01() // filebuf_type* close() std::filebuf* f; f = fb_01.close(); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( !fb_01.is_open() ); f = fb_02.close(); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( !fb_02.is_open() ); f = fb_03.close(); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( !fb_03.is_open() ); f = fb_03.close(); - VERIFY( f == NULL ); + VERIFY( !f ); VERIFY( !fb_03.is_open() ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc index 2074ee78a0b..fe0624d109e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 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 @@ -71,7 +71,7 @@ void test01() VERIFY( !cvt->unshift_called ); filebuf* ret = fb.close(); VERIFY( cvt->unshift_called ); - VERIFY( ret == NULL ); + VERIFY( !ret ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc index 9d0cb0f7499..c1a0f79c8e2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 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 @@ -48,7 +48,7 @@ void test_02() // read (ext) FILE* f2 = fopen(name_01, "r"); - VERIFY( f2 != NULL ); + VERIFY( f2 ); if (f2) { __gnu_cxx::stdio_filebuf fb(f2, std::ios_base::in, 512); @@ -58,7 +58,7 @@ void test_02() // read (standard) FILE* f = fopen(name_01, "r"); - VERIFY( f != NULL ); + VERIFY( f ); if (f) { std::ifstream ifstream1(name_01); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc index e520682b112..f2c5abc3eb3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc @@ -1,7 +1,7 @@ // { dg-require-fork "" } // { dg-require-mkfifo "" } -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -69,14 +69,14 @@ bool test_07() filebuf fb; filebuf* ret = fb.open(name, ios_base::in | ios_base::out); - VERIFY( ret != NULL ); + VERIFY( ret != 0 ); VERIFY( fb.is_open() ); s1.signal(); s2.wait(); fb.sputc('a'); ret = fb.close(); - VERIFY( ret != NULL ); + VERIFY( ret != 0 ); VERIFY( !fb.is_open() ); return test; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc index baa4ed31eb8..417fbc2ce39 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 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 @@ -69,7 +69,7 @@ void test01() VERIFY( !cvt->unshift_called ); wfilebuf* ret = fb.close(); VERIFY( cvt->unshift_called ); - VERIFY( ret == NULL ); + VERIFY( !ret ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc index a3a78120e78..b233f65637e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc @@ -4,7 +4,8 @@ // 2004-04-16 Petur Runolfsson -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 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 @@ -68,7 +69,7 @@ bool test01() wfilebuf fb; fb.pubimbue(loc_us); wfilebuf* ret = fb.open(name, ios_base::out); - VERIFY( ret != NULL ); + VERIFY( ret != 0 ); VERIFY( fb.is_open() ); s1.wait(); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc index e10bd9153f2..1a40da155cf 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 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 @@ -53,11 +53,11 @@ void test_01() // Should keep the old file attached, and disregard attempt to overthrow. std::filebuf* f = fb_02.open(name_02, std::ios_base::in | std::ios_base::out | std::ios_base::trunc); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( fb_02.is_open() ); f = fb_02.open(name_03, std::ios_base::in | std::ios_base::out); - VERIFY( f == NULL ); + VERIFY( !f ); VERIFY( fb_02.is_open() ); fb_03.open(name_03, std::ios_base::out | std::ios_base::trunc); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc index 1bd81ee14d9..755784fb9ae 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 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 @@ -41,7 +41,7 @@ void test_03() int first_fd = ::open(name_01, O_RDONLY); VERIFY( first_fd != -1 ); FILE* first_file = ::fdopen(first_fd, "r"); - VERIFY( first_file != NULL ); + VERIFY( first_file ); __gnu_cxx::stdio_filebuf fb(first_file, std::ios_base::in); int second_fd = fb.fd(); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc index cfec76b310b..5b404375e63 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc @@ -1,6 +1,7 @@ // { dg-require-mkfifo "" } -// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2005, 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 @@ -55,7 +56,7 @@ void test_06() std::ios_base::in | std::ios_base::out | std::ios_base::ate); - if (r == NULL) + if (!r) VERIFY( !fbuf.is_open() ); else VERIFY( fbuf.is_open() ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc index db02187dece..d762fb48c2c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 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 @@ -37,7 +37,7 @@ void test01() wfilebuf* f = fb.close(); VERIFY( n1 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc index 9ea64cc3e93..f11916e6f77 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 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 @@ -39,7 +39,7 @@ void test02() VERIFY( n1 != wfilebuf::traits_type::eof() ); VERIFY( n2 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc index 2f10e0dec42..2be9b52cbd2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 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 @@ -36,7 +36,7 @@ void test03() wfilebuf* f = fb.close(); VERIFY( n1 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc index a03d9e8d1ab..7b48bfe7bb9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 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 @@ -38,7 +38,7 @@ void test04() VERIFY( n1 != wfilebuf::traits_type::eof() ); VERIFY( n2 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc index 3b434ba7a52..42688e825e0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 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 @@ -40,8 +40,8 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - test = (this->pbase() == NULL); - test &= (this->pptr() == NULL); + test = (!this->pbase()); + test &= (!this->pptr()); return test; } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc index 4fd2d47130e..a2368f93203 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc index 89ec0e53d1f..c84a079d298 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc index 5ac2cc08ccb..b65d0890064 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc @@ -1,6 +1,6 @@ // 1999-09-20 bkoz -// Copyright (C) 1999, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2003, 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 @@ -35,7 +35,7 @@ void test01() iostate iostate02, iostate03; const iostate iostate01 = std::ios_base::badbit | std::ios_base::eofbit; - std::ios ios_01(NULL); + std::ios ios_01(0); // bool fail() const VERIFY( ios_01.fail() ); diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc index 9150d1126bd..0cf07f212b8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc @@ -1,6 +1,6 @@ // 1999-09-20 bkoz -// Copyright (C) 1999, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2003, 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 @@ -35,8 +35,8 @@ void test02() // basic_ios& copyfmt(const basic_ios& rhs) { - std::ios ios_01(NULL); - std::ios ios_02(NULL); + std::ios ios_01(0); + std::ios ios_02(0); ios_01.exceptions(std::ios_base::eofbit); ios_02.exceptions(std::ios_base::eofbit); @@ -49,8 +49,8 @@ void test02() } { - std::ios ios_01(NULL); - std::ios ios_02(NULL); + std::ios ios_01(0); + std::ios ios_02(0); ios_01.clear(std::ios_base::eofbit); ios_02.exceptions(std::ios_base::eofbit); diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc index 0a171a6fc54..79390eaca1c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc @@ -2,7 +2,7 @@ // 1999-09-20 bkoz -// Copyright (C) 1999, 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2003, 2005, 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 @@ -37,8 +37,8 @@ void test03() typedef std::ios_base::iostate iostate; locale loc_c = locale::classic(); locale loc_de = locale("de_DE"); - std::ios ios_01(NULL); - std::ios ios_02(NULL); + std::ios ios_01(0); + std::ios ios_02(0); ios_01.imbue(loc_c); ios_02.imbue(loc_de); ios_02.setstate(ios_base::badbit); diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc index 03f70c89458..f0494bd458d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc @@ -1,6 +1,6 @@ // 1999-09-20 bkoz -// Copyright (C) 1999, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2003, 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 @@ -35,13 +35,13 @@ void test01() // iostate exceptions() const iostate iostate02; { - std::ios ios_01(NULL); + std::ios ios_01(0); VERIFY( ios_01.exceptions() == std::ios_base::goodbit ); } // void exceptions(iostate except) { - std::ios ios_01(NULL); + std::ios ios_01(0); try { ios_01.exceptions(std::ios_base::eofbit); } @@ -53,7 +53,7 @@ void test01() } { - std::ios ios_01(NULL); + std::ios ios_01(0); ios_01.clear(std::ios_base::eofbit); try { ios_01.exceptions(std::ios_base::eofbit); diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc index 3d5bf772434..20de8a95708 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc @@ -1,6 +1,6 @@ // 1999-09-20 bkoz -// Copyright (C) 1999, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2003, 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 @@ -29,7 +29,7 @@ void test01() bool test __attribute__((unused)) = true; const std::locale c_loc = std::locale::classic(); - std::ios ios_01(NULL); + std::ios ios_01(0); std::ios::char_type ct01; std::ios::char_type ct02('x');; diff --git a/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc index 4aec0e3cad3..44fe41323c7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc +++ b/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc @@ -1,7 +1,7 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,7 +34,7 @@ void test07() try { - gnu_iostr obj(NULL); + gnu_iostr obj(0); } catch(std::exception& obj) { diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc index 4162f9e68aa..3b2cb845e08 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc @@ -1,6 +1,7 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +// 2005, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,7 +34,7 @@ void test07() typedef std::basic_istream<__gnu_test::pod_ushort> gnu_istr; try - { gnu_istr obj(NULL); } + { gnu_istr obj(0); } catch(std::exception& obj) { test = false; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc index 619751506ab..9f1593eac99 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc @@ -1,6 +1,7 @@ // 1999-04-12 bkoz -// Copyright (C) 1999, 2000, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2000, 2002, 2003, 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 @@ -35,7 +36,7 @@ std::stringbuf isbuf_02(str_02, std::ios_base::in); std::stringbuf isbuf_03(str_03, std::ios_base::in); std::stringbuf isbuf_04(str_04, std::ios_base::in); -std::istream is_01(NULL); +std::istream is_01(0); std::istream is_02(&isbuf_02); std::istream is_03(&isbuf_03); std::istream is_04(&isbuf_04); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc index f0d1635da1b..36ddabad065 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 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 @@ -33,7 +33,7 @@ std::wstringbuf isbuf_02(str_02, std::ios_base::in); std::wstringbuf isbuf_03(str_03, std::ios_base::in); std::wstringbuf isbuf_04(str_04, std::ios_base::in); -std::wistream is_01(NULL); +std::wistream is_01(0); std::wistream is_02(&isbuf_02); std::wistream is_03(&isbuf_03); std::wistream is_04(&isbuf_04); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc index c6fba2f2001..7e4387d315d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc @@ -1,6 +1,6 @@ // 1999-07-26 bkoz -// Copyright (C) 1999, 2003, 2005, 2009 Free Software Foundation +// Copyright (C) 1999, 2003, 2005, 2009, 2010 Free Software Foundation // // 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 @@ -32,7 +32,7 @@ void test01() std::stringbuf isbuf_01(std::ios_base::in); std::stringbuf isbuf_02(str_02, std::ios_base::in); - std::istream is_01(NULL); + std::istream is_01(0); std::istream is_02(&isbuf_02); std::ios_base::iostate state1, state2, statefail; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc index edff0307194..812d5413412 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc @@ -1,6 +1,6 @@ // 1999-07-26 bkoz -// Copyright (C) 1999, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2003, 2009, 2010 Free Software Foundation // // 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 @@ -34,7 +34,7 @@ void test02() std::stringbuf isbuf_01(std::ios_base::in); std::stringbuf isbuf_02(str_02, std::ios_base::in); - std::istream is_01(NULL); + std::istream is_01(0); std::istream is_02(&isbuf_02); std::ios_base::iostate state1, state2, statefail; statefail = std::ios_base::failbit; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc index cfaf5b11b61..551cb111a49 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc @@ -1,6 +1,6 @@ // 1999-07-26 bkoz -// Copyright (C) 1999, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2003, 2009, 2010 Free Software Foundation // // 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 @@ -32,7 +32,7 @@ void test01() std::stringbuf isbuf_01(std::ios_base::in); std::stringbuf isbuf_02(str_02, std::ios_base::in); - std::istream is_01(NULL); + std::istream is_01(0); std::istream is_02(&isbuf_02); std::ios_base::iostate state1, state2, statefail; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc index 224d0565f3a..a2e480ebce6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc @@ -1,6 +1,6 @@ // 2002-07-25 Benjamin Kosnik -// Copyright (C) 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003, 2005, 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 @@ -39,7 +39,7 @@ void test02() sstr >> str; // 2 - pod_char* chr = NULL; + pod_char* chr = 0; sstr >> chr; // 3 diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc index 2b428037f6b..f7b749a5df0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2009, 2010 Free Software Foundation // // 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 @@ -30,7 +30,7 @@ void test01() std::wstringbuf isbuf_01(std::ios_base::in); std::wstringbuf isbuf_02(str_02, std::ios_base::in); - std::wistream is_01(NULL); + std::wistream is_01(0); std::wistream is_02(&isbuf_02); std::ios_base::iostate state1, state2, statefail; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc index a6841198d83..a697ef2b256 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 Free Software Foundation // // 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 @@ -30,7 +30,7 @@ void test02() std::wstringbuf isbuf_01(std::ios_base::in); std::wstringbuf isbuf_02(str_02, std::ios_base::in); - std::wistream is_01(NULL); + std::wistream is_01(0); std::wistream is_02(&isbuf_02); std::ios_base::iostate state1, state2, statefail; statefail = std::ios_base::failbit; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc index 3ba355d6452..6ea22e395de 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 Free Software Foundation // // 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 @@ -30,7 +30,7 @@ void test01() std::wstringbuf isbuf_01(std::ios_base::in); std::wstringbuf isbuf_02(str_02, std::ios_base::in); - std::wistream is_01(NULL); + std::wistream is_01(0); std::wistream is_02(&isbuf_02); std::ios_base::iostate state1, state2, statefail; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc index ecc50826f9e..854dc7c8565 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc @@ -1,6 +1,7 @@ // 1999-07-28 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +// 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -41,7 +42,7 @@ void test01() std::stringbuf isbuf_04(str_02, std::ios_base::in); std::stringbuf isbuf_05(str_02, std::ios_base::in | std::ios_base::out); - std::istream is_00(NULL); + std::istream is_00(0); std::istream is_01(&isbuf_01); std::istream is_02(&isbuf_02); std::istream is_03(&isbuf_03); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc index beab22c0a21..96ba7193021 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 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 @@ -28,7 +28,7 @@ void test2() { bool test __attribute__((unused)) = true; istringstream stream; - stream >> static_cast(NULL); + stream >> static_cast(0); VERIFY(stream.rdstate() & ios_base::failbit); } @@ -40,7 +40,7 @@ void test4() try { - stream >> static_cast(NULL); + stream >> static_cast(0); VERIFY(false); } catch (ios_base::failure&) diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc index 809c0083502..eab6650b1ac 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation // // 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 @@ -38,7 +38,7 @@ void test01() std::wstringbuf isbuf_04(str_02, std::ios_base::in); std::wstringbuf isbuf_05(str_02, std::ios_base::in | std::ios_base::out); - std::wistream is_00(NULL); + std::wistream is_00(0); std::wistream is_01(&isbuf_01); std::wistream is_02(&isbuf_02); std::wistream is_03(&isbuf_03); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc index eddef0ae43e..bc04b7d9b22 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 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 @@ -28,7 +28,7 @@ void test2() { bool test __attribute__((unused)) = true; wistringstream stream; - stream >> static_cast(NULL); + stream >> static_cast(0); VERIFY( stream.rdstate() & ios_base::failbit ); } @@ -40,7 +40,7 @@ void test4() try { - stream >> static_cast(NULL); + stream >> static_cast(0); VERIFY( false ); } catch (ios_base::failure&) diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc index 19169d97934..f7957d8a51c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc @@ -1,6 +1,7 @@ // 1999-08-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 +// Free Software Foundation // // 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 @@ -41,7 +42,7 @@ test03() std::stringbuf sbuf_04(str01, std::ios_base::in); std::stringbuf sbuf_05(str01, std::ios_base::in); - std::istream is_00(NULL); + std::istream is_00(0); std::istream is_04(&sbuf_04); std::istream is_05(&sbuf_05); std::ios_base::iostate statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc index 7168aefcdbb..b3027c3af95 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 Free Software Foundation // // 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 @@ -39,7 +39,7 @@ test03() std::wstringbuf sbuf_04(str01, std::ios_base::in); std::wstringbuf sbuf_05(str01, std::ios_base::in); - std::wistream is_00(NULL); + std::wistream is_00(0); std::wistream is_04(&sbuf_04); std::wistream is_05(&sbuf_05); std::ios_base::iostate statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc index 67b1955fcd6..48b245f9b96 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc @@ -1,6 +1,7 @@ // 1999-08-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 +// Free Software Foundation // // 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 @@ -41,7 +42,7 @@ test02() std::stringbuf sbuf_04(str01, std::ios_base::in); - std::istream is_00(NULL); + std::istream is_00(0); std::istream is_04(&sbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; statefail = std::ios_base::failbit; @@ -54,7 +55,7 @@ test02() is_00.getline(carray1, 20, '*'); state2 = is_00.rdstate(); // make sure failbit was set, since we couldn't extract - // from the NULL streambuf... + // from the null streambuf... VERIFY( state1 != state2 ); VERIFY( static_cast(state2 & statefail) ); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc index 49305a33171..2445dd4f749 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 Free Software Foundation // // 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 @@ -39,7 +39,7 @@ test02() std::wstringbuf sbuf_04(str01, std::ios_base::in); - std::wistream is_00(NULL); + std::wistream is_00(0); std::wistream is_04(&sbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; statefail = std::ios_base::failbit; @@ -52,7 +52,7 @@ test02() is_00.getline(carray1, 20, L'*'); state2 = is_00.rdstate(); // make sure failbit was set, since we couldn't extract - // from the NULL streambuf... + // from the null streambuf... VERIFY( state1 != state2 ); VERIFY( static_cast(state2 & statefail) ); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc index e70c1ab5fb2..de0546c321d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc @@ -1,6 +1,7 @@ // 1999-08-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 +// Free Software Foundation // // 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 @@ -36,7 +37,7 @@ test01() std::stringbuf isbuf_03(str_02, std::ios_base::in); std::stringbuf isbuf_04(str_02, std::ios_base::in); - std::istream is_00(NULL); + std::istream is_00(0); std::istream is_03(&isbuf_03); std::istream is_04(&isbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc index 6254428d368..57c827dd65b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 Free Software Foundation // // 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 @@ -34,7 +34,7 @@ test01() std::wstringbuf isbuf_03(str_02, std::ios_base::in); std::wstringbuf isbuf_04(str_02, std::ios_base::in); - std::wistream is_00(NULL); + std::wistream is_00(0); std::wistream is_03(&isbuf_03); std::wistream is_04(&isbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc index 6d501646ad6..4b818b299ca 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc @@ -1,6 +1,7 @@ // 1999-08-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 +// Free Software Foundation // // 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 @@ -36,7 +37,7 @@ test01() std::stringbuf isbuf_03(str_02, std::ios_base::in); std::stringbuf isbuf_04(str_02, std::ios_base::in); - std::istream is_00(NULL); + std::istream is_00(0); std::istream is_03(&isbuf_03); std::istream is_04(&isbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc index b4c0e32c46f..8aa4ecf4ef5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 Free Software Foundation // // 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 @@ -34,7 +34,7 @@ test01() std::wstringbuf isbuf_03(str_02, std::ios_base::in); std::wstringbuf isbuf_04(str_02, std::ios_base::in); - std::wistream is_00(NULL); + std::wistream is_00(0); std::wistream is_03(&isbuf_03); std::wistream is_04(&isbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc index b9ebe7dfe9a..3879f7b422d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc @@ -1,6 +1,6 @@ // 1999-08-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,7 +34,7 @@ test01() std::stringbuf isbuf_03(str_02, std::ios_base::in); std::stringbuf isbuf_04(str_02, std::ios_base::in); - std::istream is_00(NULL); + std::istream is_00(0); std::istream is_03(&isbuf_03); std::istream is_04(&isbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc index 1485aa1abf0..508e0c8cb4d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 Free Software Foundation // // 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 @@ -31,7 +31,7 @@ test01() std::wstringbuf isbuf_03(str_02, std::ios_base::in); std::wstringbuf isbuf_04(str_02, std::ios_base::in); - std::wistream is_00(NULL); + std::wistream is_00(0); std::wistream is_03(&isbuf_03); std::wistream is_04(&isbuf_04); std::ios_base::iostate state1, state2, statefail, stateeof; diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc index 04df562ffda..cb683666ccc 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc @@ -1,7 +1,7 @@ // 2002-01-23 Loren J. Rittle // Adpated from libstdc++/5347 submitted by markus.breuer@materna.de // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -51,10 +51,10 @@ main() #endif for (int i = 0; i < max_thread_count; i++) - pthread_create (&tid[i], NULL, thread_main, 0); + pthread_create (&tid[i], 0, thread_main, 0); for (int i = 0; i < max_thread_count; i++) - pthread_join (tid[i], NULL); + pthread_join (tid[i], 0); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc index 125440b0b20..07fb7b82eb2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc @@ -1,6 +1,7 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +// 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,7 +35,7 @@ void test07() try { - gnu_ostr obj(NULL); + gnu_ostr obj(0); } catch(std::exception& obj) { diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc index 85af3666a3b..f38e2e703db 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc @@ -1,6 +1,6 @@ // 1999-08-16 bkoz -// Copyright (C) 1999, 2000, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2002, 2003, 2009, 2010 Free Software Foundation // // 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 @@ -27,7 +27,7 @@ void test08() { bool test __attribute__((unused)) = true; - char* pt = NULL; + char* pt = 0; // 1 std::ostringstream oss; diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc index a414076b20a..76490b3c590 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc @@ -1,6 +1,6 @@ // 1999-08-16 bkoz -// Copyright (C) 1999, 2000, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2002, 2003, 2009, 2010 Free Software Foundation // // 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 @@ -27,7 +27,7 @@ void test08() { bool test __attribute__((unused)) = true; - char* pt = NULL; + char* pt = 0; // 2 std::wostringstream woss; @@ -40,7 +40,7 @@ void test08() VERIFY( woss.good() ); // 3 - wchar_t* wt = NULL; + wchar_t* wt = 0; woss.clear(); woss << wt; VERIFY( woss.bad() ); diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc index c53c160f736..0c94c68156f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc @@ -1,7 +1,8 @@ // 1999-08-16 bkoz // 1999-11-01 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 +// Free Software Foundation // // 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 @@ -46,7 +47,7 @@ test02() // filebuf-> NULL std::ifstream f_in1(name_01); std::ofstream f_out1(name_02); - std::stringbuf* strbuf01 = NULL; + std::stringbuf* strbuf01 = 0; iostate state01 = f_in1.rdstate(); f_in1 >> strbuf01; iostate state02 = f_in1.rdstate(); diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc index 3e5dddc16e4..6d28c5f0459 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 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 @@ -28,7 +28,7 @@ void test1() bool test __attribute__((unused)) = true; ostringstream stream; - stream << static_cast(NULL); + stream << static_cast(0); VERIFY( stream.rdstate() & ios_base::badbit ); } @@ -42,7 +42,7 @@ void test3() try { - stream << static_cast(NULL); + stream << static_cast(0); VERIFY( false ); } catch (ios_base::failure&) diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc index bde6ba5985c..6e12a65bfbe 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2005, 2009 Free Software Foundation +// Copyright (C) 2005, 2009, 2010 Free Software Foundation // // 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 @@ -41,7 +41,7 @@ test02() // filebuf-> NULL std::wifstream f_in1(name_01); std::wofstream f_out1(name_02); - std::wstringbuf* strbuf01 = NULL; + std::wstringbuf* strbuf01 = 0; iostate state01 = f_in1.rdstate(); f_in1 >> strbuf01; iostate state02 = f_in1.rdstate(); diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc index 7e5cd6ddb65..076aece6475 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -28,7 +28,7 @@ void test1() bool test __attribute__((unused)) = true; wostringstream stream; - stream << static_cast(NULL); + stream << static_cast(0); VERIFY( stream.rdstate() & ios_base::badbit ); } @@ -42,7 +42,7 @@ void test3() try { - stream << static_cast(NULL); + stream << static_cast(0); VERIFY( false ); } catch (ios_base::failure&) diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc index 8a4088c95ba..00becef2587 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc @@ -1,6 +1,7 @@ // 1999-10-14 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +// 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,7 +41,7 @@ void test01() const string_type str01; - stringbuf_type* strbuf01 = NULL; + stringbuf_type* strbuf01 = 0; stringbuf_type strbuf02(str01); ostream_type ostr01(strbuf01); ostream_type ostr02(&strbuf02); diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc index 81a8c96652d..5b87d84c022 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc @@ -1,7 +1,7 @@ // 2002-01-23 Loren J. Rittle // Adpated from libstdc++/5347 submitted by markus.breuer@materna.de // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -48,10 +48,10 @@ main() #endif for (int i = 0; i < max_thread_count; i++) - pthread_create (&tid[i], NULL, thread_main, 0); + pthread_create (&tid[i], 0, thread_main, 0); for (int i = 0; i < max_thread_count; i++) - pthread_join (tid[i], NULL); + pthread_join (tid[i], 0); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc index 918726c8778..65aff09ec27 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc @@ -1,6 +1,7 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +// 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,12 +41,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc index 384ea29afb0..30b67e4e6d1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,12 +40,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc index 37d729c92ad..cbf17820f38 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc @@ -1,6 +1,7 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +// 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,12 +41,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc index 16df0994dde..0c5c63f337d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,12 +40,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc index be6145c6e6a..d1530b18f3f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc @@ -1,6 +1,7 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +// 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,12 +41,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc index 948865c5a64..66b4af5d3e6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,12 +40,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/char/1057.cc index 11cda23da15..440d82b5abe 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/wchar_t/1057.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/wchar_t/1057.cc index d04be240824..5e7166fdd3d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/wchar_t/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputc/wchar_t/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc index 0fe945eec61..2874b0eea4e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc @@ -1,6 +1,7 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +// 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -40,12 +41,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1057.cc index 227a1c7a54a..dda78bde457 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc index b03ab172927..09b263b6c7b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc @@ -1,6 +1,7 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +// 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -41,12 +42,12 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - VERIFY( this->eback() == NULL ); - VERIFY( this->gptr() == NULL ); - VERIFY( this->egptr() == NULL ); - VERIFY( this->pbase() == NULL ); - VERIFY( this->pptr() == NULL ); - VERIFY( this->epptr() == NULL ); + VERIFY( !this->eback() ); + VERIFY( !this->gptr() ); + VERIFY( !this->egptr() ); + VERIFY( !this->pbase() ); + VERIFY( !this->pptr() ); + VERIFY( !this->epptr() ); return test; } diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1057.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1057.cc index b40e24ce8a3..9b148bab93f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1057.cc index 06957dd1926..f88f28e39a1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1057.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1057.cc index 4b4216b883d..ae07ebf30ed 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1057.cc index c05d289846d..c51f47a8d34 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1057.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1057.cc index 33d1ad79afe..99f7a550993 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/objects/char/10.cc b/libstdc++-v3/testsuite/27_io/objects/char/10.cc index a744e787ac6..eebebc20e30 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/10.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/10.cc @@ -1,6 +1,6 @@ // 2003-05-01 Petur Runolfsson -// Copyright (C) 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 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 @@ -32,7 +32,7 @@ void test10() const char* name = "filebuf_virtuals-1.txt"; FILE* ret = freopen(name, "r", stdin); - VERIFY( ret != NULL ); + VERIFY( ret ); streampos p1 = cin.tellg(); VERIFY( p1 != streampos(-1) ); diff --git a/libstdc++-v3/testsuite/27_io/objects/char/5268.cc b/libstdc++-v3/testsuite/27_io/objects/char/5268.cc index 44f569c85e6..b7c0ac1df3d 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/5268.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/5268.cc @@ -1,6 +1,6 @@ // 2001-06-05 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 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 @@ -27,7 +27,7 @@ void test04() std::stringbuf b1; std::cout.rdbuf( &b1 ); std::cout << "hello\n"; - std::cout.rdbuf(NULL); + std::cout.rdbuf(0); } int main() diff --git a/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc b/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc index 59b8f4d09c5..1ad194cd81f 100644 --- a/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc +++ b/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc @@ -3,7 +3,7 @@ // 2003-04-30 Petur Runolfsson -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -58,7 +58,7 @@ bool test01() if (child == 0) { FILE* file = fopen(name, "r+"); - VERIFY( file != NULL ); + VERIFY( file != 0 ); fputs("Whatever\n", file); fflush(file); s1.signal(); diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/5268.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/5268.cc index 918d4c5d7d6..04571cc63ed 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/5268.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/5268.cc @@ -1,6 +1,6 @@ // 2003-05-01 Petur Runolfsson -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 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 @@ -27,7 +27,7 @@ void test04() std::wstringbuf b1; std::wcout.rdbuf( &b1 ); std::wcout << L"hello\n"; - std::wcout.rdbuf(NULL); + std::wcout.rdbuf(0); } int main() diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/aggregate.cc b/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/aggregate.cc index fa35b9cb208..ae2b76f248b 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/aggregate.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/aggregate.cc @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -19,6 +19,7 @@ // . #include +#include int main() { diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/single_value.cc b/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/single_value.cc index 7a2e94977a7..b7e524a38f5 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/single_value.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_address/cons/single_value.cc @@ -1,6 +1,6 @@ // { dg-options "-std=gnu++0x" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -22,7 +22,7 @@ int main() { // Single value constructor. - void* v = NULL; + void* v = 0; std::atomic_address a(v); return 0; } diff --git a/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc index 078cffceab8..7e9d30b4f23 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/cons/assign_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -33,4 +33,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 32 } -// { dg-error "deleted function" "" { target *-*-* } 83 } +// { dg-error "deleted function" "" { target *-*-* } 82 } diff --git a/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc index e13a0f6cfba..c1ef0511b8d 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/cons/copy_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -32,4 +32,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 31 } -// { dg-error "deleted function" "" { target *-*-* } 82 } +// { dg-error "deleted function" "" { target *-*-* } 81 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc index 6c6cefa177a..42af43939d5 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -33,4 +33,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 32 } -// { dg-error "deleted function" "" { target *-*-* } 135 } +// { dg-error "deleted function" "" { target *-*-* } 134 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc index b62011b8b56..53ff57deab8 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -32,4 +32,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 31 } -// { dg-error "deleted function" "" { target *-*-* } 134 } +// { dg-error "deleted function" "" { target *-*-* } 133 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc index 2e092bedd11..7fa64285882 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/assign_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -33,4 +33,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 32 } -// { dg-error "deleted function" "" { target *-*-* } 298 } +// { dg-error "deleted function" "" { target *-*-* } 297 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc index 9d10a7dac55..df1ca0bc924 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/copy_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -32,4 +32,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 31 } -// { dg-error "deleted function" "" { target *-*-* } 297 } +// { dg-error "deleted function" "" { target *-*-* } 296 } diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc index f45b9f203ae..11705794ac9 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/assign_neg.cc @@ -32,4 +32,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 31 } -// { dg-error "deleted function" "" { target *-*-* } 149 } +// { dg-error "deleted function" "" { target *-*-* } 148 } diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc index ce5034bf502..898ad16350f 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/copy_neg.cc @@ -31,5 +31,5 @@ void test01() } // { dg-error "here" "" { target *-*-* } 30 } -// { dg-error "deleted function" "" { target *-*-* } 127 } +// { dg-error "deleted function" "" { target *-*-* } 126 } // { dg-excess-errors "In file included from" } diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc index 4648196966d..45b2385242d 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/assign_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -33,4 +33,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 32 } -// { dg-error "deleted function" "" { target *-*-* } 193 } +// { dg-error "deleted function" "" { target *-*-* } 192 } diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc index 716b0562a42..04dea643fff 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/copy_neg.cc @@ -3,7 +3,7 @@ // { dg-require-cstdint "" } // { dg-require-gthreads "" } -// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -32,4 +32,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 31 } -// { dg-error "deleted function" "" { target *-*-* } 192 } +// { dg-error "deleted function" "" { target *-*-* } 191 } diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc b/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc index bd52fd34545..609f188aade 100644 --- a/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc +++ b/libstdc++-v3/testsuite/ext/mt_allocator/22309_thread.cc @@ -1,7 +1,7 @@ // { dg-require-sharedlib "" } // { dg-options "-g -O2 -pthread -ldl" { target *-*-linux* } } -// Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 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 @@ -93,7 +93,7 @@ int main (void) { pthread_t th; - pthread_create(&th, NULL, tf, NULL); - pthread_join(th, NULL); + pthread_create(&th, 0, tf, 0); + pthread_join(th, 0); return 0; } diff --git a/libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc b/libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc index b1520be4a57..fd1ed09c6c3 100644 --- a/libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc +++ b/libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc @@ -1,6 +1,6 @@ // 2003-05-03 Loren J. Rittle // -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -90,10 +90,10 @@ main() foo4 += foo3; for (int i = 0; i < max_thread_count; i++) - pthread_create (&tid[i], NULL, thread_main, 0); + pthread_create (&tid[i], 0, thread_main, 0); for (int i = 0; i < max_thread_count; i++) - pthread_join (tid[i], NULL); + pthread_join (tid[i], 0); } VERIFY( !std::strcmp (data, "barbazbongle") ); diff --git a/libstdc++-v3/testsuite/ext/slist/23781.cc b/libstdc++-v3/testsuite/ext/slist/23781.cc index 9b0e0a53e82..e1493c67558 100644 --- a/libstdc++-v3/testsuite/ext/slist/23781.cc +++ b/libstdc++-v3/testsuite/ext/slist/23781.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include __gnu_cxx::slist::iterator it = NULL; // { dg-error "conversion" } __gnu_cxx::slist::const_iterator cit = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-2.cc b/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-2.cc index ce719e576f2..d0a1fcfc406 100644 --- a/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-2.cc +++ b/libstdc++-v3/testsuite/ext/stdio_filebuf/char/10063-2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 2000, 2001, 2002, 2003, 2009, 2010 Free Software Foundation // // 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 @@ -37,7 +37,7 @@ void test2() fbuf.close(); FILE* file = fopen("tmp_10063-2", "r"); - setbuf(file, NULL); + setbuf(file, 0); int c = getc(file); VERIFY(c == '0'); c = getc(file); diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/iterator_null_neg.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/iterator_null_neg.cc index a8a06fdbcdc..1709816c306 100644 --- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/iterator_null_neg.cc +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/iterator_null_neg.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::tr1::unordered_multimap::iterator it2 = NULL; // { dg-error "conversion" } std::tr1::unordered_multimap::const_iterator cit2 = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/iterator_null_neg.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/iterator_null_neg.cc index d77676eb1a1..2201b2d29d1 100644 --- a/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/iterator_null_neg.cc +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/iterator_null_neg.cc @@ -1,6 +1,6 @@ // 2005-09-10 Paolo Carlini // -// Copyright (C) 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 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 @@ -22,6 +22,7 @@ // libstdc++/23781 #include +#include std::tr1::unordered_multiset::iterator it3 = NULL; // { dg-error "conversion" } std::tr1::unordered_multiset::const_iterator cit3 = NULL; // { dg-error "conversion" } diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.tcc b/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.tcc index 43cdb9f2b62..0f158664853 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.tcc +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.tcc @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 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 @@ -45,7 +45,7 @@ container_rand_regression_test(unsigned long seed, size_t n, size_t m, double mp, bool disp) : m_seed((seed == 0) ? twister_rand_gen::get_time_determined_seed() : seed), m_n(n), m_m(m), m_tp(tp), m_ip(ip), m_ep(ep), m_cp(cp), m_mp(mp), - m_disp(disp), m_p_c(NULL) + m_disp(disp), m_p_c(0) { } PB_DS_CLASS_T_DEC @@ -71,7 +71,7 @@ default_constructor() done = false; } - if (m_p_c != NULL) + if (m_p_c) PB_DS_COND_COMPARE(*m_p_c, m_native_c); return done; } @@ -98,7 +98,7 @@ copy_constructor() { PB_DS_TRACE("copy_constructor"); bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typename alloc_t::group_adjustor adjust(m_p_c->size()); @@ -124,7 +124,7 @@ assignment_operator() { PB_DS_TRACE("assignment operator"); bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typename alloc_t::group_adjustor adjust(m_p_c->size()); @@ -159,7 +159,7 @@ PB_DS_CLASS_C_DEC:: it_constructor_imp(__gnu_pbds::cc_hash_tag) { bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typename alloc_t::group_adjustor adjust(m_p_c->size()); @@ -226,7 +226,7 @@ PB_DS_CLASS_C_DEC:: it_constructor_imp(__gnu_pbds::gp_hash_tag) { bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typename alloc_t::group_adjustor adjust(m_p_c->size()); @@ -309,7 +309,7 @@ PB_DS_CLASS_C_DEC:: it_constructor_imp(__gnu_pbds::tree_tag) { bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typename alloc_t::group_adjustor adjust(m_p_c->size()); @@ -345,7 +345,7 @@ PB_DS_CLASS_C_DEC:: it_constructor_imp(__gnu_pbds::list_update_tag) { bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typename alloc_t::group_adjustor adjust(m_p_c->size()); @@ -370,7 +370,7 @@ PB_DS_CLASS_C_DEC:: it_constructor_imp(__gnu_pbds::pat_trie_tag) { bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typename alloc_t::group_adjustor adjust(m_p_c->size()); @@ -869,7 +869,7 @@ PB_DS_CLASS_C_DEC:: operator()() { typedef xml_result_set_regression_formatter formatter_type; - formatter_type* p_fmt = NULL; + formatter_type* p_fmt = 0; if (m_disp) p_fmt = new formatter_type(string_form::name(), @@ -1591,30 +1591,30 @@ policy_access(__gnu_pbds::basic_hash_tag) { { typename Cntnr::hash_fn& r_t = m_p_c->get_hash_fn(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::hash_fn& r_t =((const Cntnr& )*m_p_c).get_hash_fn(); - assert(&r_t != NULL); + assert(&r_t); } { typename Cntnr::eq_fn& r_t = m_p_c->get_eq_fn(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::eq_fn& r_t =((const Cntnr& )*m_p_c).get_eq_fn(); - assert(&r_t != NULL); + assert(&r_t); } { typename Cntnr::resize_policy& r_t = m_p_c->get_resize_policy(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::resize_policy& r_t =((const Cntnr& )*m_p_c).get_resize_policy(); - assert(&r_t != NULL); + assert(&r_t); } } @@ -1627,12 +1627,12 @@ policy_access(__gnu_pbds::cc_hash_tag) { typename Cntnr::comb_hash_fn& r_t = m_p_c->get_comb_hash_fn(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::comb_hash_fn& r_t =((const Cntnr& )*m_p_c).get_comb_hash_fn(); - assert(&r_t != NULL); + assert(&r_t); } } @@ -1645,21 +1645,21 @@ policy_access(__gnu_pbds::gp_hash_tag) { typename Cntnr::comb_probe_fn& r_t = m_p_c->get_comb_probe_fn(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::comb_probe_fn& r_t =((const Cntnr& )*m_p_c).get_comb_probe_fn(); - assert(&r_t != NULL); + assert(&r_t); } { typename Cntnr::probe_fn& r_t = m_p_c->get_probe_fn(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::probe_fn& r_t =((const Cntnr& )*m_p_c).get_probe_fn(); - assert(&r_t != NULL); + assert(&r_t); } } @@ -1670,12 +1670,12 @@ policy_access(__gnu_pbds::tree_tag) { { typename Cntnr::cmp_fn& r_t = m_p_c->get_cmp_fn(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::cmp_fn& r_t =((const Cntnr& )*m_p_c).get_cmp_fn(); - assert(&r_t != NULL); + assert(&r_t); } } @@ -1691,7 +1691,7 @@ PB_DS_CLASS_C_DEC:: policy_access(__gnu_pbds::pat_trie_tag) { typename Cntnr::e_access_traits& r_t = m_p_c->get_e_access_traits(); - assert(&r_t != NULL); + assert(&r_t); } diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp index d4b395b126a..5f230495236 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +// 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 @@ -124,7 +124,7 @@ namespace detail }; // XXX RAII, constructor takes bool for display - xml_test_rand_regression_formatter* p_fmt = NULL; + xml_test_rand_regression_formatter* p_fmt = 0; if (disp) p_fmt = new xml_test_rand_regression_formatter(sd, n, m, tp, ip, ep, cp, mp); diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.tcc b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.tcc index f964911facb..e929f3533fe 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.tcc +++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.tcc @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 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 @@ -45,7 +45,7 @@ container_rand_regression_test(unsigned long seed, size_t n, size_t m, double cp, double mp, bool disp) : m_seed(seed == 0 ? twister_rand_gen::get_time_determined_seed(): seed), m_n(n), m_m(m), m_tp(tp), m_ip(ip), m_dp(dp), m_ep(ep), m_cp(cp), - m_mp(mp), m_disp(disp), m_p_c(NULL) + m_mp(mp), m_disp(disp), m_p_c(0) { } PB_DS_CLASS_T_DEC @@ -71,7 +71,7 @@ default_constructor() done = false; } - if (m_p_c != NULL) + if (m_p_c) PB_DS_COND_COMPARE(*m_p_c, m_native_c); return done; @@ -99,7 +99,7 @@ copy_constructor() { PB_DS_TRACE("copy_constructor"); bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typedef typename allocator_type::group_adjustor adjustor; @@ -127,7 +127,7 @@ assignment_operator() { PB_DS_TRACE("assignment operator"); bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typedef typename allocator_type::group_adjustor adjustor; @@ -155,7 +155,7 @@ PB_DS_CLASS_C_DEC:: it_constructor() { bool done = true; - Cntnr* p_c = NULL; + Cntnr* p_c = 0; m_alloc.set_probability(m_tp); typedef typename allocator_type::group_adjustor adjustor; adjustor adjust(m_p_c->size()); @@ -242,7 +242,7 @@ PB_DS_CLASS_C_DEC:: operator()() { typedef xml_result_set_regression_formatter formatter_type; - formatter_type* p_fmt = NULL; + formatter_type* p_fmt = 0; if (m_disp) p_fmt = new formatter_type(string_form::name(), string_form::desc()); @@ -668,12 +668,12 @@ policy_access() { typename Cntnr::cmp_fn& r_t = m_p_c->get_cmp_fn(); - assert(&r_t != NULL); + assert(&r_t); } { const typename Cntnr::cmp_fn& r_t =((const Cntnr& )*m_p_c).get_cmp_fn(); - assert(&r_t != NULL); + assert(&r_t); } } diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp index 1cf86020d45..37f8d51af74 100644 --- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp +++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 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 @@ -123,7 +123,7 @@ namespace detail return -2; }; - xml_test_rand_regression_formatter* p_fmt = NULL; + xml_test_rand_regression_formatter* p_fmt = 0; if (sd == 0) sd = twister_rand_gen::get_time_determined_seed(); if (disp) diff --git a/libstdc++-v3/testsuite/util/replacement_memory_operators.h b/libstdc++-v3/testsuite/util/replacement_memory_operators.h index c7b19edc457..895ccfe3897 100644 --- a/libstdc++-v3/testsuite/util/replacement_memory_operators.h +++ b/libstdc++-v3/testsuite/util/replacement_memory_operators.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2007, 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 @@ -90,7 +90,7 @@ void* operator new(std::size_t size) throw(std::bad_alloc) { std::printf("operator new is called \n"); void* p = std::malloc(size); - if (p == NULL) + if (!p) throw std::bad_alloc(); __gnu_test::counter::increment(); return p; @@ -99,7 +99,7 @@ void* operator new(std::size_t size) throw(std::bad_alloc) void operator delete(void* p) throw() { std::printf("operator delete is called \n"); - if (p != NULL) + if (p) { std::free(p); __gnu_test::counter::decrement(); diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h index 96fe546b482..b7fce48b5bc 100644 --- a/libstdc++-v3/testsuite/util/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h @@ -1,7 +1,7 @@ // -*- C++ -*- // Testing allocator for the C++ library testsuite. // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -186,8 +186,8 @@ namespace __gnu_test { // Let's not core here... Alloc a; - a.deallocate(NULL, 1); - a.deallocate(NULL, 10); + a.deallocate(0, 1); + a.deallocate(0, 10); return true; } diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.cc b/libstdc++-v3/testsuite/util/testsuite_hooks.cc index 6d77d57672f..5b5b0d5a9a1 100644 --- a/libstdc++-v3/testsuite/util/testsuite_hooks.cc +++ b/libstdc++-v3/testsuite/util/testsuite_hooks.cc @@ -2,7 +2,7 @@ // Utility subroutines for the C++ library testsuite. // -// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -170,7 +170,7 @@ namespace __gnu_test locale orig = locale::global(loc_name); const char* res = setlocale(LC_ALL, name); - if (res != NULL) + if (res) { string preLC_ALL = res; const func_callback::test_type* tests = l.tests(); diff --git a/libstdc++-v3/testsuite/util/testsuite_io.h b/libstdc++-v3/testsuite/util/testsuite_io.h index 50b1955ca11..681448aa51f 100644 --- a/libstdc++-v3/testsuite/util/testsuite_io.h +++ b/libstdc++-v3/testsuite/util/testsuite_io.h @@ -1,7 +1,7 @@ // -*- C++ -*- // Testing streambuf/filebuf/stringbuf for the C++ library testsuite. // -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -47,7 +47,7 @@ namespace __gnu_test bool write_position() { - bool one = this->pptr() != NULL; + bool one = this->pptr() != 0; bool two = this->pptr() < this->epptr(); return one && two; } @@ -55,7 +55,7 @@ namespace __gnu_test bool read_position() { - bool one = this->gptr() != NULL; + bool one = this->gptr() != 0; bool two = this->gptr() < this->egptr(); return one && two; } @@ -63,21 +63,21 @@ namespace __gnu_test bool unbuffered() { - bool one = this->pbase() == NULL; - bool two = this->pptr() == NULL; + bool one = this->pbase() == 0; + bool two = this->pptr() == 0; return one && two; } bool check_pointers() { - bool one = this->eback() == NULL; - bool two = this->gptr() == NULL; - bool three = this->egptr() == NULL; + bool one = this->eback() == 0; + bool two = this->gptr() == 0; + bool three = this->egptr() == 0; - bool four = this->pbase() == NULL; - bool five = this->pptr() == NULL; - bool six = this->epptr() == NULL; + bool four = this->pbase() == 0; + bool five = this->pptr() == 0; + bool six = this->epptr() == 0; return one && two && three && four && five && six; } }; @@ -276,37 +276,37 @@ namespace __gnu_test protected: iter_type do_put(iter_type, ios_base&, char_type, bool) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } virtual iter_type do_put(iter_type, ios_base&, char_type, long) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } virtual iter_type do_put(iter_type, ios_base&, char_type, unsigned long) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } #ifdef _GLIBCXX_USE_LONG_LONG virtual iter_type do_put(iter_type, ios_base&, char_type, long long) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } virtual iter_type do_put(iter_type, ios_base&, char_type, unsigned long long) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } #endif virtual iter_type do_put(iter_type, ios_base&, char_type, double) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } virtual iter_type do_put(iter_type, ios_base&, char_type, long double) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } virtual iter_type do_put(iter_type, ios_base&, char_type, const void*) const - { throw facet_error(); return iter_type(NULL); } + { throw facet_error(); return iter_type(0); } }; typedef fail_num_put fail_num_put_char; diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h index 14a725fcbec..ee0c8e6eecd 100644 --- a/libstdc++-v3/testsuite/util/testsuite_iterators.h +++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h @@ -1,7 +1,7 @@ // -*- C++ -*- // Iterator Wrappers for the C++ library testsuite. // -// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -201,7 +201,7 @@ namespace __gnu_test bool operator==(const input_iterator_wrapper& in) const { - ITERATOR_VERIFY(SharedInfo != NULL && SharedInfo == in.SharedInfo); + ITERATOR_VERIFY(SharedInfo && SharedInfo == in.SharedInfo); ITERATOR_VERIFY(ptr>=SharedInfo->first && in.ptr>=SharedInfo->first); return ptr == in.ptr; } @@ -274,8 +274,8 @@ namespace __gnu_test forward_iterator_wrapper() { - this->ptr = NULL; - this->SharedInfo = NULL; + this->ptr = 0; + this->SharedInfo = 0; } T& diff --git a/libstdc++-v3/testsuite/util/testsuite_performance.h b/libstdc++-v3/testsuite/util/testsuite_performance.h index 54cf8856701..61efd042db2 100644 --- a/libstdc++-v3/testsuite/util/testsuite_performance.h +++ b/libstdc++-v3/testsuite/util/testsuite_performance.h @@ -1,7 +1,7 @@ // -*- C++ -*- // Testing performance utilities for the C++ library testsuite. // -// Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 +// Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -50,7 +50,7 @@ extern "C" struct mallinfo mallinfo(void) { - struct mallinfo m = { (((size_t) sbrk (0) + 1023) / 1024), 0 }; + struct mallinfo m = { (((std::size_t) sbrk (0) + 1023) / 1024), 0 }; return m; } } @@ -114,15 +114,15 @@ namespace __gnu_test std::__throw_runtime_error("time_counter::stop"); } - size_t + std::size_t real_time() const { return elapsed_end - elapsed_begin; } - size_t + std::size_t user_time() const { return tms_end.tms_utime - tms_begin.tms_utime; } - size_t + std::size_t system_time() const { return tms_end.tms_stime - tms_begin.tms_stime; } }; @@ -383,7 +383,7 @@ template template void* - do_thread(void* p = NULL) + do_thread(void* p = 0) { do_loop(); return p; @@ -412,10 +412,10 @@ template pthread_create(&t3, 0, &do_thread, 0); pthread_create(&t4, 0, &do_thread, 0); - pthread_join(t1, NULL); - pthread_join(t2, NULL); - pthread_join(t3, NULL); - pthread_join(t4, NULL); + pthread_join(t1, 0); + pthread_join(t2, 0); + pthread_join(t3, 0); + pthread_join(t4, 0); #endif } stop_counters(time, resource); -- 2.11.4.GIT