From fe31b387e8af8584846d51a7ff5b05fbef761162 Mon Sep 17 00:00:00 2001
From: Justin Viiret <justin.viiret@intel.com>
Date: Thu, 10 Aug 2017 16:58:48 +1000
Subject: [PATCH] hash: use std::hash for string hashing

---
 src/util/hash.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/util/hash.h b/src/util/hash.h
index 1c35d20c..60bc670a 100644
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -35,6 +35,7 @@
 #define UTIL_HASH_H
 
 #include <functional>
+#include <string>
 #include <type_traits>
 #include <utility>
 
@@ -123,10 +124,16 @@ struct ue2_hash<T, typename std::enable_if<has_hash_member<T>::value>::type> {
     }
 };
 
-/** \brief Hash for any container type that supports std::begin(). */
+/**
+ * \brief Hash for any container type that supports std::begin().
+ *
+ * We exempt std::string as std::hash<std:string> is provided and quicker.
+ */
 template<typename T>
-struct ue2_hash<T, typename std::enable_if<is_container<T>::value &&
-                                           !has_hash_member<T>::value>::type> {
+struct ue2_hash<T, typename std::enable_if<
+           is_container<T>::value &&
+           !std::is_same<typename std::decay<T>::type, std::string>::value &&
+           !has_hash_member<T>::value>::type> {
     size_t operator()(const T &obj) const {
         size_t v = 0;
         for (const auto &elem : obj) {