Use std:tr1::hash<std::string> where possible.

* c++/subr.hh (string_hash_combine): Removed.
  (hash<std::string>): Extend std::tr1::hash<std::string>.
* c++/dwarf_data (value_string): typedef std::tr1::hash<std::string>
  hasher.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index c80600350b766381703363c92f5dcdae8b093d21..f8f8017bff7bdd2ce352cdbe53516c9157ff66a5 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-11  Mark Wielaard  <mjw@redhat.com>
+
+       * c++/subr.hh (string_hash_combine): Removed.
+       (hash<std::string>): Extend std::tr1::hash<std::string>.
+       * c++/dwarf_data (value_string): typedef std::tr1::hash<std::string>
+       hasher.
+
 2010-07-26  Roland McGrath  <roland@redhat.com>
 
        * dwarf_getlocation_implicit_pointer.c: New file.

diff --git a/libdw/c++/dwarf_data b/libdw/c++/dwarf_data
index 2cc548bdefb2f1b675055020c3d78350ff313a88..4a334b4cfe39e7845d35b8994c5b21f43c841cc1 100644 (file)
--- a/libdw/c++/dwarf_data
+++ b/libdw/c++/dwarf_data
@@ -870,7 +870,7 @@ namespace elfutils
 
       struct value_string : public value_dispatch, public std::string
       {
-       typedef subr::hash<std::string> hasher;
+       typedef std::tr1::hash<std::string> hasher;
 
        inline value_string () {}
 

diff --git a/libdw/c++/subr.hh b/libdw/c++/subr.hh
index fda1f29545714526b5318ab39fd719c065403740..bb57538e7afe5dac5a4234cbddacf6a3f2e4a276 100644 (file)
--- a/libdw/c++/subr.hh
+++ b/libdw/c++/subr.hh
@@ -53,12 +53,6 @@ namespace elfutils
       hash_combine (seed, v.second);
     }
 
-    inline void
-    string_hash_combine (size_t &hash, const std::string::value_type &c)
-    {
-      hash = hash * 33 + c;
-    }
-
     template<typename T, typename B>
     struct base_hasher : public std::unary_function<T, size_t>
     {
@@ -147,7 +141,7 @@ namespace elfutils
 
     template<>
     struct hash<std::string>
-      : public container_hasher<std::string, string_hash_combine, 5381>
+      : public std::tr1::hash<std::string>
     {
     };