2006-11-21 Benjamin Kosnik <bkoz@redhat.com>

	
	* include/ext/hashtable.h: -Wshadow fixes.
	* include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp: Same.
	* include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp: Same.
	* include/ext/pb_ds/detail/pat_trie_/internal_node.hpp: Same.
	* include/ext/pb_ds/detail/gp_hash_table_map_/
	constructor_destructor_fn_imps.hpp: Same.
	* include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp: Same.
	* include/ext/pb_ds/detail/ov_tree_map_/
	constructors_destructor_fn_imps.hpp: Same.
	* src/mt_allocator.cc: Same.
	* src/debug.cc: Same.
	* config/locale/gnu/codecvt_members.cc: Same.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@119061 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 24 insertions, 25 deletions

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
index 936d825e324..679efa5c475 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
@@ -131,8 +131,8 @@ join(PB_DS_CLASS_C_DEC& other)
   _GLIBCXX_DEBUG_ONLY(assert_valid();)
   _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
 
-  const size_type size = m_size + other.m_size;
-  const size_type actual_size = resize_policy::get_new_size_for_arbitrary(size);
+  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;
@@ -158,7 +158,7 @@ join(PB_DS_CLASS_C_DEC& other)
 
   s_entry_allocator.deallocate(m_a_entries, m_actual_size);
   m_a_entries = a_entries;
-  m_size = size;
+  m_size = len;
   m_actual_size = actual_size;
 
   resize_policy::notify_arbitrary(actual_size);
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
index 80e06e94b8f..265a7052780 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
@@ -64,7 +64,6 @@ inline typename PB_DS_CLASS_C_DEC::size_type
 PB_DS_CLASS_C_DEC::
 erase_if(Pred pred)
 {
-  typedef typename PB_DS_TYPES_TRAITS_C_DEC::const_reference const_reference;
   size_type num_ersd = 0;
   for (size_type pos = 0; pos < m_num_e; ++pos)
     {
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
index 57f8b970d52..eda2c48da52 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
@@ -58,8 +58,8 @@ do_resize_if_needed()
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-do_resize(size_type size)
-{ resize_imp(resize_base::get_nearest_larger_size(size)); }
+do_resize(size_type len)
+{ resize_imp(resize_base::get_nearest_larger_size(len)); }
 
 PB_DS_CLASS_T_DEC
 inline void
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
index 1491a91671e..30b8d3e7b73 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
@@ -110,10 +110,10 @@ PB_DS_CLASS_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn,
 PB_DS_CLASS_T_DEC
 PB_DS_CLASS_C_DEC::
 PB_DS_CLASS_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn, 
-		 const Comb_Probe_Fn& comb_hash_fn, const Probe_Fn& probe_fn) 
+		 const Comb_Probe_Fn& comb_hash_fn, const Probe_Fn& prober) 
 : hash_eq_fn_base(r_eq_fn),
   ranged_probe_fn_base(resize_base::get_nearest_larger_size(1),
-		       r_hash_fn, comb_hash_fn, probe_fn),
+		       r_hash_fn, comb_hash_fn, prober),
   m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
   m_entries(s_entry_allocator.allocate(m_num_e))
 {
@@ -124,11 +124,11 @@ PB_DS_CLASS_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn,
 PB_DS_CLASS_T_DEC
 PB_DS_CLASS_C_DEC::
 PB_DS_CLASS_NAME(const Hash_Fn& r_hash_fn, const Eq_Fn& r_eq_fn, 
-		 const Comb_Probe_Fn& comb_hash_fn, const Probe_Fn& probe_fn, 
+		 const Comb_Probe_Fn& comb_hash_fn, const Probe_Fn& prober, 
 		 const Resize_Policy& r_resize_policy) 
 : hash_eq_fn_base(r_eq_fn), resize_base(r_resize_policy),
   ranged_probe_fn_base(resize_base::get_nearest_larger_size(1),
-		       r_hash_fn, comb_hash_fn, probe_fn),
+		       r_hash_fn, comb_hash_fn, prober),
   m_num_e(resize_base::get_nearest_larger_size(1)), m_num_used_e(0),
   m_entries(s_entry_allocator.allocate(m_num_e))
 {
@@ -205,9 +205,9 @@ deallocate_all()
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-erase_all_valid_entries(entry_array a_entries_resized, size_type size)
+erase_all_valid_entries(entry_array a_entries_resized, size_type len)
 {
-  for (size_type pos = 0; pos < size; ++pos)
+  for (size_type pos = 0; pos < len; ++pos)
     {
       entry_pointer p_e = &a_entries_resized[pos];
       if (p_e->m_stat == valid_entry_status)
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
index ecd6aeab386..83a47250f83 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
@@ -137,16 +137,16 @@ void
 PB_DS_CLASS_C_DEC::
 copy_from_ordered_range(It first_it, It last_it)
 {
-  const size_type size = std::distance(first_it, last_it);
-  if (size == 0)
+  const size_type len = std::distance(first_it, last_it);
+  if (len == 0)
     return;
 
-  value_vector a_values = s_value_alloc.allocate(size);
+  value_vector a_values = s_value_alloc.allocate(len);
   iterator target_it = a_values;
   It source_it = first_it;
   It source_end_it = last_it;
 
-  cond_dtor<size_type> cd(a_values, target_it, size);
+  cond_dtor<size_type> cd(a_values, target_it, len);
   while (source_it != source_end_it)
     {
       new (const_cast<void* >(static_cast<const void* >(target_it)))
@@ -155,10 +155,10 @@ copy_from_ordered_range(It first_it, It last_it)
       ++target_it;
     }
 
-  reallocate_metadata((node_update* )this, size);
+  reallocate_metadata((node_update* )this, len);
   cd.set_no_action();
   m_a_values = a_values;
-  m_size = size;
+  m_size = len;
   m_end_it = m_a_values + m_size;
   update(PB_DS_node_begin_imp(), (node_update* )this);
 
@@ -181,16 +181,16 @@ copy_from_ordered_range(It first_it, It last_it, It other_first_it,
 			It other_last_it)
 {
   clear();
-  const size_type size = std::distance(first_it, last_it) 
+  const size_type len = std::distance(first_it, last_it) 
     		         + std::distance(other_first_it, other_last_it);
 
-  value_vector a_values = s_value_alloc.allocate(size);
+  value_vector a_values = s_value_alloc.allocate(len);
 
   iterator target_it = a_values;
   It source_it = first_it;
   It source_end_it = last_it;
 
-  cond_dtor<size_type> cd(a_values, target_it, size);
+  cond_dtor<size_type> cd(a_values, target_it, len);
   while (source_it != source_end_it)
     {
       new (const_cast<void* >(static_cast<const void* >(target_it)))
@@ -208,10 +208,10 @@ copy_from_ordered_range(It first_it, It last_it, It other_first_it,
       ++target_it;
     }
 
-  reallocate_metadata((node_update* )this, size);
+  reallocate_metadata((node_update* )this, len);
   cd.set_no_action();
   m_a_values = a_values;
-  m_size = size;
+  m_size = len;
   m_end_it = m_a_values + m_size;
   update(PB_DS_node_begin_imp(), (node_update* )this);
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp
index 41329e2715b..1061988c327 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp
@@ -243,9 +243,9 @@ namespace pb_ds
 
     PB_DS_CLASS_T_DEC
     PB_DS_CLASS_C_DEC::
-    pat_trie_internal_node(size_type e_ind, const const_e_iterator pref_b_it) :
+    pat_trie_internal_node(size_type len, const const_e_iterator it) :
       PB_DS_BASE_C_DEC(pat_trie_internal_node_type),
-      m_e_ind(e_ind), m_pref_b_it(pref_b_it), m_pref_e_it(pref_b_it)
+      m_e_ind(len), m_pref_b_it(it), m_pref_e_it(it)
     {
       std::advance(m_pref_e_it, m_e_ind);
       std::fill(m_a_p_children, m_a_p_children + arr_size,