X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fdns.h;h=3c8e55d08a1ea3d6f6c73007ce44a1f1a3f270b2;hb=9de86c34d41fcbcedf7b332746b7f0e8c37c7c45;hp=8284971032300b29644e677b2ab3a805ad89b9df;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/dns.h b/include/dns.h
index 828497103..3c8e55d08 100644
--- 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
 	 */