ListModeBase: Minor changes to original u_listmode code

[user/henk/code/inspircd.git] / include / dns.h

diff --git a/include/dns.h b/include/dns.h
index 8284971032300b29644e677b2ab3a805ad89b9df..3c8e55d08a1ea3d6f6c73007ce44a1f1a3f270b2 100644 (file)
--- a/include/dns.h
+++ b/include/dns.h
@@ -102,11 +102,7 @@ class CoreExport CachedQuery
 
 /** DNS cache information. Holds IPs mapped to hostnames, and hostnames mapped to IPs.
  */
-#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
-typedef nspace::hash_map<irc::string, CachedQuery, nspace::hash_compare<irc::string> > dnscache;
-#else
-typedef nspace::hash_map<irc::string, CachedQuery, irc::hash> dnscache;
-#endif
+typedef std::tr1::unordered_map<irc::string, CachedQuery, irc::hash> dnscache;
 
 /**
  * Error types that class Resolver can emit to its error method.
@@ -298,11 +294,6 @@ class CoreExport DNS : public EventHandler
         */
        static const int MAX_REQUEST_ID = 0xFFFF;
 
-       /**
-        * A counter used to form part of the pseudo-random id
-        */
-       int currid;
-
        /**
         * Currently cached items
         */