m_filter Remove redundant flags field from FilterResult

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

diff --git a/include/typedefs.h b/include/typedefs.h
index 615af6c9ce05182191e197e248f97e3d6e900263..da277515285cd7f6339c58d64a43f26ba50b5ae5 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -34,6 +34,8 @@ class DNSRequest;
 class Extensible;
 class FakeUser;
 class InspIRCd;
+class Invitation;
+class InviteBase;
 class LocalUser;
 class Membership;
 class Module;
@@ -54,17 +56,12 @@ 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 of failed port bindings, used for informational purposes on startup */
@@ -72,7 +69,7 @@ typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
 
 /** Holds a complete list of all channels to which a user has been invited and has not yet joined, and the time at which they'll expire.
  */
-typedef std::vector< std::pair<irc::string, time_t> > InvitedList;
+typedef std::vector<Invitation*> InviteList;
 
 /** Holds a complete list of all allow and deny tags from the configuration file (connection classes)
  */