Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/include/typedefs.h b/include/typedefs.h
index 7659628d22c900dffca052e384a76d42a5d3cbd4..06f704120126309a93114d0996ea20d24139e75e 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -56,19 +56,18 @@ struct ResourceRecord;
 #include "hashcomp.h"
 #include "base.h"
 
-#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
-       typedef nspace::hash_map<std::string, User*, nspace::hash_compare<std::string, std::less<std::string> > > user_hash;
-       typedef nspace::hash_map<std::string, Channel*, nspace::hash_compare<std::string, std::less<std::string> > > chan_hash;
+#ifdef HASHMAP_DEPRECATED
+       typedef nspace::hash_map<std::string, User*, nspace::insensitive, irc::StrHashComp> user_hash;
+       typedef nspace::hash_map<std::string, Channel*, nspace::insensitive, irc::StrHashComp> chan_hash;
 #else
-       #ifdef HASHMAP_DEPRECATED
-               typedef nspace::hash_map<std::string, User*, nspace::insensitive, irc::StrHashComp> user_hash;
-               typedef nspace::hash_map<std::string, Channel*, nspace::insensitive, irc::StrHashComp> chan_hash;
-       #else
-               typedef nspace::hash_map<std::string, User*, nspace::hash<std::string>, irc::StrHashComp> user_hash;
-               typedef nspace::hash_map<std::string, Channel*, nspace::hash<std::string>, irc::StrHashComp> chan_hash;
-       #endif
+       typedef nspace::hash_map<std::string, User*, nspace::hash<std::string>, irc::StrHashComp> user_hash;
+       typedef nspace::hash_map<std::string, Channel*, nspace::hash<std::string>, irc::StrHashComp> chan_hash;
 #endif
 
+/** A list holding local users, this is the type of UserManager::local_users
+ */
+typedef std::list<LocalUser*> LocalUserList;
+
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, std::string> > FailedPortList;