From 0cf907e5e32f0d3dcc53de3e08af34af6b98e40e Mon Sep 17 00:00:00 2001
From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 26 Jun 2015 16:50:19 +0000
Subject: [PATCH] gcc/ 	* hash-map.h (hash_map::traverse): Use the definition
 of the 	Key typedef rather than the typedef itself.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225021 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog  | 5 +++++
 gcc/hash-map.h | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af039248c15..6f54c22927a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-26  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* hash-map.h (hash_map::traverse): Use the definition of the
+	Key typedef rather than the typedef itself.
+
 2015-06-26  Martin Jambor  <mjambor@suse.cz>
 
 	PR debug/66301
diff --git a/gcc/hash-map.h b/gcc/hash-map.h
index cd97d354f1c..59794eb1042 100644
--- a/gcc/hash-map.h
+++ b/gcc/hash-map.h
@@ -169,7 +169,8 @@ public:
   /* Call the call back on each pair of key and value with the passed in
      arg.  */
 
-  template<typename Arg, bool (*f)(const Key &, const Value &, Arg)>
+  template<typename Arg, bool (*f)(const typename Traits::key_type &,
+				   const Value &, Arg)>
   void traverse (Arg a) const
     {
       for (typename hash_table<hash_entry>::iterator iter = m_table.begin ();
@@ -177,7 +178,8 @@ public:
 	f ((*iter).m_key, (*iter).m_value, a);
     }
 
-  template<typename Arg, bool (*f)(const Key &, Value *, Arg)>
+  template<typename Arg, bool (*f)(const typename Traits::key_type &,
+				   Value *, Arg)>
   void traverse (Arg a) const
     {
       for (typename hash_table<hash_entry>::iterator iter = m_table.begin ();
-- 
2.11.4.GIT