From fd655fa93a00a5f2993adb7ef562b6dbab8aa87c Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Mon, 1 Apr 2013 05:25:03 +0100
Subject: Purge the deprecated hash_map from existance.

---
 src/modules/m_spanningtree/utils.h | 6 +-----
 src/modules/m_watch.cpp            | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 7d5ffa216..0d44cd24f 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -36,11 +36,7 @@ class SpanningTreeUtilities;
 /* This hash_map holds the hash equivalent of the server
  * tree, used for rapid linear lookups.
  */
-#ifdef HASHMAP_DEPRECATED
-	typedef nspace::hash_map<std::string, TreeServer*, nspace::insensitive, irc::StrHashComp> server_hash;
-#else
-	typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash;
-#endif
+typedef std::tr1::unordered_map<std::string, TreeServer*, std::tr1::insensitive, irc::StrHashComp> server_hash;
 
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
 
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index ec38edc31..3b87ed4c3 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -97,7 +97,7 @@
  * Yes, it's horrid. Blame cl for being different. -- w00t
  */
 
-typedef nspace::hash_map<irc::string, std::deque<User*>, irc::hash> watchentries;
+typedef std::tr1::unordered_map<irc::string, std::deque<User*>, irc::hash> watchentries;
 typedef std::map<irc::string, std::string> watchlist;
 
 /* Who's watching each nickname.
-- 
cgit v1.2.3