From 53fe5bb2f9a2f4956ad63ac42df2047a8b8705ec Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 14 Jan 2014 19:05:56 +0000
Subject: fix warnings on compilers that provide unordered_set

(bzr r12929)
---
 src/util/unordered-containers.h | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/util/unordered-containers.h b/src/util/unordered-containers.h
index 70d36c4dc..98c2fa3c9 100644
--- a/src/util/unordered-containers.h
+++ b/src/util/unordered-containers.h
@@ -19,8 +19,24 @@
 #include <glibmm/ustring.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-#if defined(HAVE_TR1_UNORDERED_SET)
 
+#if defined(HAVE_NATIVE_UNORDERED_SET)
+# include <unordered_set>
+# include <unordered_map>
+# define INK_UNORDERED_SET std::unordered_set
+# define INK_UNORDERED_MAP std::unordered_map
+# define INK_HASH std::hash
+
+namespace std {
+template <>
+struct hash<Glib::ustring> : public std::unary_function<Glib::ustring, std::size_t> {
+    std::size_t operator()(Glib::ustring const &s) const {
+        return hash<std::string>()(s.raw());
+    }
+};
+} // namespace std
+
+#elif defined(HAVE_TR1_UNORDERED_SET)
 # include <tr1/unordered_set>
 # include <tr1/unordered_map>
 # define INK_UNORDERED_SET std::tr1::unordered_set
-- 
cgit v1.2.3