summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2013-04-01 05:25:03 +0100
committerPeter Powell <petpow@saberuk.com>2013-04-01 05:57:33 +0100
commitfd655fa93a00a5f2993adb7ef562b6dbab8aa87c (patch)
tree31157094a88c713ffa3bdf549b936e13ae22712c /src/modules
parent1cb05553e286227e6bbd463d0b4b8cae40ff3940 (diff)
Purge the deprecated hash_map from existance.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_spanningtree/utils.h6
-rw-r--r--src/modules/m_watch.cpp2
2 files changed, 2 insertions, 6 deletions
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.