From fa70c0e286d268ef3e35f2d08a0404dcbf02caa3 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 4 Aug 2016 20:01:10 +0100
Subject: Use C++11 unordered containers

(bzr r15040)
---
 src/util/unordered-containers.h | 46 +++++------------------------------------
 1 file changed, 5 insertions(+), 41 deletions(-)

(limited to 'src')

diff --git a/src/util/unordered-containers.h b/src/util/unordered-containers.h
index b92f2e7ea..0bda8191f 100644
--- a/src/util/unordered-containers.h
+++ b/src/util/unordered-containers.h
@@ -20,12 +20,11 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-#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
+#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 <>
@@ -36,41 +35,6 @@ struct hash<Glib::ustring> : public std::unary_function<Glib::ustring, std::size
 };
 } // namespace std
 
-#elif defined(HAVE_TR1_UNORDERED_SET)
-# include <tr1/unordered_set>
-# include <tr1/unordered_map>
-# define INK_UNORDERED_SET std::tr1::unordered_set
-# define INK_UNORDERED_MAP std::tr1::unordered_map
-# define INK_HASH std::tr1::hash
-
-namespace std {
-namespace tr1 {
-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 tr1
-} // namespace std
-
-#elif defined(HAVE_BOOST_UNORDERED_SET)
-# include <boost/unordered_set.hpp>
-# include <boost/unordered_map.hpp>
-# define INK_UNORDERED_SET boost::unordered_set
-# define INK_UNORDERED_MAP boost::unordered_map
-# define INK_HASH boost::hash
-
-namespace boost {
-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 boost
-#endif
-
 #else
 /// Name (with namespace) of the unordered set template.
 #define INK_UNORDERED_SET
-- 
cgit v1.2.3