diff options
| -rw-r--r-- | include/account.h | 2 | ||||
| -rw-r--r-- | include/anope.h | 6 | ||||
| -rw-r--r-- | include/hashcomp.h | 7 | ||||
| -rw-r--r-- | include/modules/os_session.h | 2 | ||||
| -rw-r--r-- | modules/m_dns.cpp | 2 |
5 files changed, 6 insertions, 13 deletions
diff --git a/include/account.h b/include/account.h index a26f1e184..eb1b6a81f 100644 --- a/include/account.h +++ b/include/account.h @@ -19,7 +19,7 @@ typedef Anope::hash_map<NickAlias *> nickalias_map; typedef Anope::hash_map<NickCore *> nickcore_map; -typedef TR1NS::unordered_map<uint64_t, NickCore *> nickcoreid_map; +typedef std::unordered_map<uint64_t, NickCore *> nickcoreid_map; extern CoreExport Serialize::Checker<nickalias_map> NickAliasList; extern CoreExport Serialize::Checker<nickcore_map> NickCoreList; diff --git a/include/anope.h b/include/anope.h index 17677bf73..59f7c1684 100644 --- a/include/anope.h +++ b/include/anope.h @@ -312,7 +312,7 @@ namespace Anope { inline size_t operator()(const string &s) const { - return TR1NS::hash<std::string>()(s.lower().str()); + return std::hash<std::string>()(s.lower().str()); } }; @@ -320,7 +320,7 @@ namespace Anope { inline size_t operator()(const string &s) const { - return TR1NS::hash<std::string>()(s.str()); + return std::hash<std::string>()(s.str()); } }; @@ -334,7 +334,7 @@ namespace Anope template<typename T> class map : public std::map<string, T, ci::less> { }; template<typename T> class multimap : public std::multimap<string, T, ci::less> { }; - template<typename T> class hash_map : public TR1NS::unordered_map<string, T, hash_ci, compare> { }; + template<typename T> class hash_map : public std::unordered_map<string, T, hash_ci, compare> { }; #ifndef REPRODUCIBLE_BUILD static const char *const compiled = __TIME__ " " __DATE__; diff --git a/include/hashcomp.h b/include/hashcomp.h index 0d04a6144..4a29fb859 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -10,14 +10,7 @@ #include <string> #include <locale> - -#if defined _LIBCPP_VERSION || defined _WIN32 #include <unordered_map> -#define TR1NS std -#else -#include <tr1/unordered_map> -#define TR1NS std::tr1 -#endif #include "services.h" diff --git a/include/modules/os_session.h b/include/modules/os_session.h index 42456e4af..7456ebc3a 100644 --- a/include/modules/os_session.h +++ b/include/modules/os_session.h @@ -34,7 +34,7 @@ struct Exception : Serializable class SessionService : public Service { public: - typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap; + typedef std::unordered_map<cidr, Session *, cidr::hash> SessionMap; typedef std::vector<Exception *> ExceptionVector; SessionService(Module *m) : Service(m, "SessionService", "session") { } diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp index 3bbb4cfc8..45e2a1530 100644 --- a/modules/m_dns.cpp +++ b/modules/m_dns.cpp @@ -649,7 +649,7 @@ class MyManager : public Manager, public Timer { uint32_t serial; - typedef TR1NS::unordered_map<Question, Query, Question::hash> cache_map; + typedef std::unordered_map<Question, Query, Question::hash> cache_map; cache_map cache; TCPSocket *tcpsock = nullptr; |