diff options
| author |  Attila Molnar | 2013-04-20 12:04:12 -0700 |
|---|---|---|
| committer | Attila Molnar | 2013-04-20 12:04:12 -0700 |
| commit | e9e75e50bc25e67af22dd88b39b12217a553d5cb (patch) | |
| tree | d16a152c375232039ce2243145c57d3bb4aed525 /src/modules | |
| parent | Fix Windows build (diff) | |
| parent | Fix building with libc++. (diff) | |
Merge pull request #495 from SaberUK/master+fix-libcpp
Fix building with libc++.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_spanningtree/utils.h | 2 | ||||
| -rw-r--r-- | src/modules/m_watch.cpp | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index f67a0d3c1..36c161287 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -35,7 +35,7 @@ class SpanningTreeUtilities; /* This hash_map holds the hash equivalent of the server * tree, used for rapid linear lookups. */ -typedef std::tr1::unordered_map<std::string, TreeServer*, std::tr1::insensitive, irc::StrHashComp> server_hash; +typedef TR1NS::unordered_map<std::string, TreeServer*, irc::insensitive, irc::StrHashComp> server_hash; typedef std::set<TreeServer*> TreeServerList; diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 60ea79a83..fdb20be2d 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -92,12 +92,7 @@ * of users using WATCH. */ -/* - * Before you start screaming, this definition is only used here, so moving it to a header is pointless. - * Yes, it's horrid. Blame cl for being different. -- w00t - */ - -typedef std::tr1::unordered_map<irc::string, std::deque<User*>, irc::hash> watchentries; +typedef TR1NS::unordered_map<irc::string, std::deque<User*>, irc::hash> watchentries; typedef std::map<irc::string, std::string> watchlist; /* Who's watching each nickname. |