diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-04-01 09:50:50 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2013-04-01 09:50:50 -0700 |
| commit | 66b90807bb94d88c8a34ec8a1fd7c1558941c47a (patch) | |
| tree | b2147238c609c5b1733c518b1b932b0e40ddb8a0 /src/modules | |
| parent | 80e88c163dbd77b06b61d4fd734d51249cc0e172 (diff) | |
| parent | fd655fa93a00a5f2993adb7ef562b6dbab8aa87c (diff) | |
Merge pull request #452 from SaberUK/master+nuke-hashmap
Purge the deprecated hash_map from existance.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_spanningtree/utils.h | 6 | ||||
| -rw-r--r-- | src/modules/m_watch.cpp | 2 |
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. |