c++config (std::size_t, [...]): Provide typedefs.

2010-06-03  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/c++config (std::size_t, std::ptrdiff_t,
        std::nullptr_t): Provide typedefs.
	* include/c_std/cstddef: Don't provide std::size_t and
	std::ptrdiff_t here.
	* include/c_global/cstddef: Likewise.
	* src/condition_variable.cc: Don't include <cstddef>,
	don't use NULL, use std::size_t and std::ptrdiff_t.
	* src/mt_allocator.cc: Likewise.
	* src/localename.cc: Likewise.
	* src/chrono.cc: Likewise.
	* src/thread.cc: Likewise.
	* include/debug/formatter.h: Likewise.
	* include/debug/functions.h: Likewise.
	* include/std/valarray: Likewise.
	* include/std/thread: Likewise.
	* include/std/type_traits: Likewise.
	* include/std/atomic: Likewise.
	* include/std/iterator: Likewise.
	* include/std/bitset: Likewise.
	* include/std/fstream: Likewise.
	* include/std/mutex: Likewise.
	* include/c_std/cstdlib: Likewise.
	* include/c_std/cstdio: Likewise.
	* include/c_std/ctime: Likewise.
	* include/c_std/cwchar: Likewise.
	* include/c_std/cstring: Likewise.
	* include/parallel/multiway_merge.h: Likewise.
	* include/parallel/multiseq_selection.h: Likewise.
	* include/parallel/base.h: Likewise.
	* include/parallel/basic_iterator.h: Likewise.
	* include/parallel/multiway_mergesort.h
	* include/parallel/partition.h: Likewise.
	* include/ext/string_conversions.h: Likewise.
	* include/ext/pb_ds/assoc_container.hpp: Likewise.
	* include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp:
	Likewise.
	* include/ext/pb_ds/detail/resize_policy/
	hash_prime_size_policy_imp.hpp: Likewise.
	* include/ext/pb_ds/detail/resize_policy/
	sample_resize_policy.hpp: Likewise.
	* include/ext/pb_ds/detail/resize_policy/
	sample_resize_trigger.hpp: Likewise.
	* include/ext/pb_ds/detail/binomial_heap_base_/
	erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/binomial_heap_base_/
	find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/binomial_heap_base_/
	insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/binomial_heap_base_/
	constructors_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/binomial_heap_base_/
	debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/binomial_heap_base_/
	split_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	erase_store_hash_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/d: Likewise.etail/cc_hash_table_map_/
	insert_no_store_hash_fn_imps.hpp
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	cmp_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	insert_store_hash_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	info_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	entry_list_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	trace_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	cc_ht_map_.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	resize_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	constructor_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/cc_hash_table_map_/
	erase_no_store_hash_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/unordered_iterator/
	iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/unordered_iterator/
	const_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/unordered_iterator/
	point_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/unordered_iterator/
	const_point_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/
	insert_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/
	constructors_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/
	const_child_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/internal_node.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp: Likewise.
	* include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	r_erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	constructors_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	rotate_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	node_iterators.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	point_iterators.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	split_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/bin_search_tree_/
	iterators_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/gp_hash_table_map_/
	find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/gp_hash_table_map_/
	gp_ht_map_.hpp: Likewise.
	* include/ext/pb_ds/detail/gp_hash_table_map_/
	resize_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/gp_hash_table_map_/
	standard_policies.hpp: Likewise.
	* include/ext/pb_ds/detail/tree_policy/
	sample_tree_node_update.hpp: Likewise.
	* include/ext/pb_ds/detail/basic_tree_policy/
	null_node_metadata.hpp: Likewise.
	* include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/binary_heap_/
	const_point_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/binary_heap_/
	split_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/trie_policy/
	sample_trie_node_update.hpp: Likewise.
	* include/ext/pb_ds/detail/trie_policy/
	sample_trie_e_access_traits.hpp: Likewise.
	* include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/pairing_heap_/
	split_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_policy/
	counter_lu_metadata.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	trace_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	null_metadata.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	const_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	constructors_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	iterators_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/left_child_next_sibling_heap_/
	const_point_iterator.hpp: Likewise.
	* include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/thin_heap_/
	constructors_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/thin_heap_/
	split_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/ov_tree_map_/
	constructors_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp: Likewise.
	* include/ext/pb_ds/detail/ov_tree_map_/
	iterators_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp: Likewise.
	* include/ext/pb_ds/detail/hash_fn/
	sample_ranged_probe_fn.hpp: Likewise.
	* include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp: Likewise.
	* include/ext/pb_ds/detail/hash_fn/
	sample_ranged_hash_fn.hpp: Likewise.
	* include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/splay_tree_/
	split_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/
	trace_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/
	erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/
	find_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/
	constructor_destructor_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/
	insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/
	info_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/list_update_map_/
	iterators_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rc_binomial_heap_/
	erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rc_binomial_heap_/
	insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rc_binomial_heap_/
	debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rb_tree_map_/
	split_join_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp: Likewise.
	* include/ext/pb_ds/list_update_policy.hpp: Likewise.
	* include/ext/pb_ds/exception.hpp: Likewise.
	* include/ext/pb_ds/tree_policy.hpp: Likewise.
	* include/ext/pb_ds/tag_and_trait.hpp: Likewise.
	* include/ext/pb_ds/hash_policy.hpp: Likewise.
	* include/ext/pb_ds/trie_policy.hpp: Likewise.
	* include/ext/pb_ds/priority_queue.hpp: Likewise.
	* include/ext/throw_allocator.h: Likewis: Likewise.e.
	* include/ext/bitmap_allocator.h
	* include/ext/rc_string_base.h: Likewise.
	* include/ext/new_allocator.h: Likewise.
	* include/ext/codecvt_specializations.h: Likewise.
	* include/ext/functional: Likewise.: Likewise.
	* include/ext/array_allocator.h: Likewise.
	* include/ext/mt_allocator.h: Likewise.
	* include/ext/sso_string_base.h: Likewise.
	* include/profile/impl/profiler_trace.h: Likewise.
	* include/profile/impl/profiler_node.h: Likewise.
	* include/bits/stl_algobase.h: Likewise.
	* include/bits/functional_hash.h: Likewise.
	* include/bits/locale_facets.tcc: Likewise.
	* include/bits/locale_facets.h: Likewise.
	* include/bits/stl_iterator_base_types.h: Likewise.
	* include/bits/move.h: Likewise.
	* include/bits/boost_concept_check.h: Likewise.
	* include/bits/basic_string.tcc: Likewise.
	* include/bits/locale_facets_nonio.tcc: Likewise.
	* include/bits/fstream.tcc: Likewise.
	* include/bits/locale_facets_nonio.h: Likewise.
	* include/c_global/cstdlib: Likewise.
	* include/c_global/cstdio: Likewise.
	* include/c_global/ctime: Likewise.
	* include/c_global/cwchar: Likewise.
	* include/c_global/cstring
	* include/tr1/type_traits: Likewise.
	* include/backward/hash_fun.h: Likewise.
	* libsupc++/new: Likewise.
	* libsupc++/initializer_list: Likewise.
	* testsuite/27_io/basic_ofstream/pthread2.cc: Likewise.
	* testsuite/27_io/basic_iostream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetn/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetc/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputn/wchar_t/1057.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputn/char/1057.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputn/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputc/wchar_t/1057.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputc/char/1057.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/5268.cc: Likewise.
	* testsuite/27_io/objects/char/9661-1.cc: Likewise.
	* testsuite/27_io/objects/char/5268.cc: Likewise.
	* testsuite/27_io/objects/char/10.cc: Likewise.
	* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Likewise.
	* testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise.
	* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
	* testsuite/27_io/basic_ios/locales/char/1.cc: Likewise.
	* testsuite/27_io/basic_ios/clear/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/pthread3.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputc/wchar_t/1057.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputc/char/1057.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputn/wchar_t/1057.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputn/char/1057.cc: Likewise.
	* testsuite/27_io/basic_istream/get/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/get/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
	exceptions_null.cc
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
	1.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/
	exceptions_null.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/cons/3.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/
	wchar_t/01.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/
	char/01.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/
	wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/
	wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/
	wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/
	char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/
	char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/
	char/3.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/
	char/9826.cc: Likewise.
	* testsuite/27_io/basic_istream/read/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/read/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	exceptions_null.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	1.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/
	exceptions_null.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_ostream/sentry/pod/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/
	wchar_t/8.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/
	char/8.cc: Likewise.
	* testsuite/27_io/basic_filebuf/setbuf/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/1057.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/9507.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/9964.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/1057.cc: Likewise.
	* testsuite/24_iterators/ostreambuf_iterator/2.cc: Likewise.
	* testsuite/18_support/bad_exception/23591_thread-1.c
	* testsuite/18_support/new_delete_placement.cc: Likewise.
	* testsuite/18_support/pthread_guard.cc: Likewise.
	* testsuite/21_strings/basic_string/operations/wchar_t/1.cc: Likewise.
	* testsuite/21_strings/basic_string/operations/char/1.cc: Likewise.
	* testsuite/21_strings/basic_string/pthread4.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/5.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/5.cc: Likewise.
	* testsuite/30_threads/timed_mutex/cons/assign_neg.cc: Likewise.
	* testsuite/30_threads/timed_mutex/cons/copy_neg.cc: Likewise.
	* testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Likewise.
	* testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Likewise.
	* testsuite/30_threads/mutex/cons/assign_neg.cc: Likewise.
	* testsuite/30_threads/mutex/cons/copy_neg.cc: Likewise.
	* testsuite/30_threads/thread/cons/assign_neg.cc: Likewise.
	* testsuite/30_threads/thread/cons/copy_neg.cc: Likewise.
	* testsuite/30_threads/recursive_timed_mutex/cons/
	assign_neg.cc: Likewise.
	* testsuite/30_threads/recursive_timed_mutex/cons/
	copy_neg.cc: Likewise.
	* testsuite/ext/mt_allocator/22309_thread.cc: Likewise.
	* testsuite/ext/slist/23781.cc: Likewise.
	* testsuite/ext/rope/pthread7-rope.cc: Likewise.
	* testsuite/ext/stdio_filebuf/char/10063-2.cc: Likewise.
	* testsuite/22_locale/ctype/is/wchar_t/1.cc: Likewise.
	* testsuite/22_locale/ctype/is/char/1.cc: Likewise.
	* testsuite/22_locale/time_put/put/char/12439_1.cc: Likewise.
	* testsuite/22_locale/time_put/put/char/12439_3.cc: Likewise.
	* testsuite/22_locale/locale/cons/2.cc: Likewise.
	* testsuite/22_locale/locale/cons/12658_thread-1.cc: Likewise.
	* testsuite/22_locale/locale/cons/29217.cc: Likewise.
	* testsuite/22_locale/locale/global_locale_objects/14071.cc: Likewise.
	* testsuite/22_locale/locale/global_locale_objects/2.cc: Likewise.
	* testsuite/tr1/6_containers/unordered_multimap/
	requirements/iterator_null_neg.cc: Likewise.
	* testsuite/tr1/6_containers/unordered_multiset/
	requirements/iterator_null_neg.cc: Likewise.
	* testsuite/29_atomics/atomic_address/cons/single_value.cc: Likewise.
	* testsuite/29_atomics/atomic_address/cons/aggregate.cc: Likewise.
	* testsuite/23_containers/multimap/23781.cc: Likewise.
	* testsuite/23_containers/set/23781.cc: Likewise.
	* testsuite/23_containers/multiset/23781.cc: Likewise.
	* testsuite/23_containers/list/pthread1.cc: Likewise.
	* testsuite/23_containers/list/23781.cc: Likewise.
	* testsuite/23_containers/map/pthread6.cc: Likewise.
	* testsuite/23_containers/map/23781.cc: Likewise.
	* testsuite/util/regression/rand/priority_queue/
	rand_regression_test.hpp: Likewise.
	* testsuite/util/regression/rand/priority_queue/
	container_rand_regression_test.tcc: Likewise.
	* testsuite/util/regression/rand/assoc/
	rand_regression_test.hpp: Likewise.
	* testsuite/util/regression/rand/assoc/
	container_rand_regression_test.tcc: Likewise.
	* testsuite/util/testsuite_hooks.cc: Likewise.
	* testsuite/util/testsuite_io.h: Likewise.
	* testsuite/util/testsuite_iterators.h: Likewise.
	* testsuite/util/replacement_memory_operators.h: Likewise.
	* testsuite/util/testsuite_allocator.h: Likewise.
	* testsuite/util/testsuite_performance.h: Likewise.

From-SVN: r160231

libstdc++-v3/include/backward/hash_fun.h

@@ -57,7 +57,7 @@
 #ifndef _BACKWARD_HASH_FUN_H
 #define _BACKWARD_HASH_FUN_H 1
 
-#include <cstddef>
+#include <bits/c++config.h>
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 

libstdc++-v3/include/bits/basic_string.tcc

 // 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<size_type>(std::distance(__beg,
 								      __end));

libstdc++-v3/include/bits/boost_concept_check.h

 // -*- 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 <cstddef>                // for ptrdiff_t, used next
+#include <bits/c++config.h>
 #include <bits/stl_iterator_base_types.h>    // for traits and tags
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)

libstdc++-v3/include/bits/c++config

 // 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.

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<typename _CharT, typename _Traits>
     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;
     }

libstdc++-v3/include/bits/functional_hash.h

@@ -32,7 +32,7 @@
 
 #pragma GCC system_header
 
-#include <cstddef>
+#include <bits/c++config.h>
 #include <bits/stl_function.h>
 
 namespace std

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<typename _CharT>

libstdc++-v3/include/bits/locale_facets.tcc

 // 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>;

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<typename _CharT>
@@ -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<typename _CharT, bool _Intl>

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>;

libstdc++-v3/include/bits/move.h

@@ -31,7 +31,6 @@
 #define _MOVE_H 1
 
 #include <bits/c++config.h>
-#include <cstddef>
 #include <bits/concept_check.h>
 
 _GLIBCXX_BEGIN_NAMESPACE(std)

libstdc++-v3/include/bits/stl_algobase.h

@@ -58,7 +58,6 @@
 #define _STL_ALGOBASE_H 1
 
 #include <bits/c++config.h>
-#include <cstddef>
 #include <bits/functexcept.h>
 #include <bits/cpp_type_traits.h>
 #include <ext/type_traits.h>

libstdc++-v3/include/bits/stl_iterator_base_types.h

@@ -63,7 +63,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 

libstdc++-v3/include/c_global/cstddef

@@ -42,15 +42,3 @@
 
 #include <bits/c++config.h>
 #include <stddef.h>
-
-#ifndef _GLIBCXX_CSTDDEF
-#define _GLIBCXX_CSTDDEF 1
-
-_GLIBCXX_BEGIN_NAMESPACE(std)
-
-  using ::ptrdiff_t;
-  using ::size_t;
-
-_GLIBCXX_END_NAMESPACE
-
-#endif

libstdc++-v3/include/c_global/cstdio

@@ -41,7 +41,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 #include <stdio.h>
 
 #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 ();

libstdc++-v3/include/c_global/cstdlib

@@ -41,7 +41,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 
 #ifndef _GLIBCXX_CSTDLIB
 #define _GLIBCXX_CSTDLIB 1

libstdc++-v3/include/c_global/cstring

@@ -41,7 +41,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 #include <string.h>
 
 #ifndef _GLIBCXX_CSTRING

libstdc++-v3/include/c_global/ctime

@@ -40,7 +40,7 @@
 
 #pragma GCC system_header
 
-#include <cstddef>
+#include <bits/c++config.h>
 #include <time.h>
 
 #ifndef _GLIBCXX_CTIME

libstdc++-v3/include/c_global/cwchar

@@ -41,7 +41,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 
 #if _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>

libstdc++-v3/include/c_std/cstddef

@@ -45,11 +45,4 @@
 #include <bits/c++config.h>
 #include <stddef.h>
 
-_GLIBCXX_BEGIN_NAMESPACE(std)
-
-  using ::ptrdiff_t;
-  using ::size_t;
-
-_GLIBCXX_END_NAMESPACE
-
 #endif

libstdc++-v3/include/c_std/cstdio

@@ -43,8 +43,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
-
 #include <stdio.h>
 
 // Get rid of those macros defined in <stdio.h> 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 ();

libstdc++-v3/include/c_std/cstdlib

@@ -43,7 +43,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 
 #if !_GLIBCXX_HOSTED
 // The C standard does not require a freestanding implementation to

libstdc++-v3/include/c_std/cstring

@@ -44,7 +44,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 #include <string.h>
 
 // Get rid of those macros defined in <string.h> in lieu of real functions.

libstdc++-v3/include/c_std/ctime

@@ -42,7 +42,7 @@
 
 #pragma GCC system_header
 
-#include <cstddef>
+#include <bits/c++config.h>
 #include <time.h>
 
 // Get rid of those macros defined in <time.h> in lieu of real functions.

libstdc++-v3/include/c_std/cwchar

@@ -44,7 +44,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <cstddef>
 
 #if _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>

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

libstdc++-v3/include/debug/functions.h

 // 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 <bits/c++config.h>
-#include <cstddef>                       // for ptrdiff_t
 #include <bits/stl_iterator_base_types.h> // for iterator_traits, categories
 #include <bits/cpp_type_traits.h>         // for __is_integer
 

libstdc++-v3/include/ext/array_allocator.h

@@ -30,7 +30,7 @@
 #ifndef _ARRAY_ALLOCATOR_H
 #define _ARRAY_ALLOCATOR_H 1
 
-#include <cstddef>
+#include <bits/c++config.h>
 #include <new>
 #include <bits/functexcept.h>
 #include <tr1/array>
@@ -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<typename _Tp1, typename _Array1>
         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() { }
 

libstdc++-v3/include/ext/bitmap_allocator.h

@@ -30,9 +30,8 @@
 #ifndef _BITMAP_ALLOCATOR_H
 #define _BITMAP_ALLOCATOR_H 1
 
-#include <cstddef> // For std::size_t, and ptrdiff_t.
-#include <bits/functexcept.h> // For __throw_bad_alloc().
 #include <utility> // For std::pair.
+#include <bits/functexcept.h> // For __throw_bad_alloc().
 #include <functional> // For greater_equal, and less_equal.
 #include <new> // For operator new.
 #include <debug/debug.h> // _GLIBCXX_DEBUG_ASSERT

libstdc++-v3/include/ext/codecvt_specializations.h

 // 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<char*>(__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))

libstdc++-v3/include/ext/functional

 // 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 <functional>
-#include <cstddef>
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 

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:

libstdc++-v3/include/ext/new_allocator.h

@@ -30,6 +30,7 @@
 #ifndef _NEW_ALLOCATOR_H
 #define _NEW_ALLOCATOR_H 1
 
+#include <bits/c++config.h>
 #include <new>
 #include <bits/functexcept.h>
 #include <bits/move.h>

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 <bits/c++config.h>
 #include <ext/typelist.h>
 #include <ext/pb_ds/tag_and_trait.hpp>
 #include <ext/pb_ds/detail/standard_policies.hpp>

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 <ext/pb_ds/detail/types_traits.hpp>
 

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;
   }

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<const_pointer, const_pointer>
     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<const_pointer, const_pointer>
     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);

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);

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;

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<const void* >(&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;
 

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));
 }
 

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<node_pointer>(p_nd))
+      bin_search_tree_const_node_it_(const node_pointer p_nd = 0) : m_p_nd(const_cast<node_pointer>(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<node_pointer>(p_nd))
       { }
 

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<Node_Pointer>(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<int,Is_Forward_Iterator>());
 	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;
       }
 

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);

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<node_pointer>(NULL)));
+			   const_node_iterator(static_cast<node_pointer>(0)));
 }
 
 PB_DS_CLASS_T_DEC

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);
 }

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;
       }

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<int, Simple>());
       }
 
@@ -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<int, Simple>());
       }
 

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;

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);)
     }

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<size_type>(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)
 	{

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);)
 

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<PB_DS_CLASS_C_DEC* >(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;

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);)
     }

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;
 }

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<entry_pointer, size_type>& 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<entry_pointer, size_type>& 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

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<PB_DS_CLASS_C_DEC& >(*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

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);

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);

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;

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();

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);)

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);)

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; }
 

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<PB_DS_CLASS_C_DEC& >(*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

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);

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);

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);
     }
 

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;

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; }
 

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

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);

libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp

 // -*- 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<size_t>,
+	__gnu_pbds::direct_mask_range_hashing<std::size_t>,
       Comb_Probe_Fn>::value,
       __gnu_pbds::linear_probe_fn<size_type>,
       __gnu_pbds::quadratic_probe_fn<size_type> >::__type

libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp

 // -*- 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:
 

libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp

 // -*- 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:
 

libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp

 // -*- 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:
 

libstdc++-v3/include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp

 // -*- 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;
 
 };
 

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;
 	  }
       }

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;
       }
 

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;
 }

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;

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);

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)

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));
 }
 

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

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 << ' ';

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<typename It>
 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

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;

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

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); }

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);

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<PB_DS_CLASS_C_DEC* const>(this));
+  return const_iterator(0, 0, const_cast<PB_DS_CLASS_C_DEC* const>(this));
 }
 

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<typename Metadata>

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;

libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp

 // -*- 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<typename Size_Type = size_t>
+    template<typename Size_Type = std::size_t>
     class counter_lu_metadata
     {
     public:

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());

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();

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();)

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();