1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/cfg.c b/gcc/cfg.c
index f0b91e0..89c0d87 100644
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -988,19 +988,21 @@ struct htab_bb_copy_original_entry
 
 struct bb_copy_hasher : typed_noop_remove <htab_bb_copy_original_entry>
 {
-  typedef htab_bb_copy_original_entry T;
-  static inline hashval_t hash (const T *);
-  static inline bool equal (const T *existing, const T * candidate);
+  typedef htab_bb_copy_original_entry value_type;
+  typedef htab_bb_copy_original_entry compare_type;
+  static inline hashval_t hash (const value_type *);
+  static inline bool equal (const value_type *existing,
+			    const compare_type * candidate);
 };
 
 inline hashval_t
-bb_copy_hasher::hash (const T *data)
+bb_copy_hasher::hash (const value_type *data)
 {
   return data->index1;
 }
 
 inline bool
-bb_copy_hasher::equal (const T *data, const T *data2)
+bb_copy_hasher::equal (const value_type *data, const compare_type *data2)
 {
   return data->index1 == data2->index1;
 }