ProtocolInterface::SendEncapsulatedData() changes

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

diff --git a/include/membership.h b/include/membership.h
index 7074566ae23ec7bfcb33fb7e0c5e6cbd3b58fec3..d98b54731884cd31d12f641e9ddd42c6a6be0a5f 100644 (file)
--- a/include/membership.h
+++ b/include/membership.h
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -19,7 +20,7 @@
 
 #pragma once
 
-class CoreExport Membership : public Extensible
+class CoreExport Membership : public Extensible, public intrusive_list_node<Membership>
 {
  public:
        User* const user;
@@ -41,13 +42,14 @@ class CoreExport Membership : public Extensible
         * @param adding True if adding the prefix, false when removing
         * @return True if a change was made
         */
-       bool SetPrefix(ModeHandler* mh, bool adding);
+       bool SetPrefix(PrefixMode* mh, bool adding);
 };
 
-class CoreExport InviteBase
+template <typename T>
+class InviteBase
 {
  protected:
-       InviteList invites;
+       intrusive_list<Invitation, T> invites;
 
  public:
        void ClearInvites();
@@ -55,7 +57,7 @@ class CoreExport InviteBase
        friend class Invitation;
 };
 
-class CoreExport Invitation : public classbase
+class CoreExport Invitation : public intrusive_list_node<Invitation, Channel>, public intrusive_list_node<Invitation, LocalUser>
 {
        Invitation(Channel* c, LocalUser* u, time_t timeout) : user(u), chan(c), expiry(timeout) {}
 
@@ -68,3 +70,16 @@ class CoreExport Invitation : public classbase
        static void Create(Channel* c, LocalUser* u, time_t timeout);
        static Invitation* Find(Channel* c, LocalUser* u, bool check_expired = true);
 };
+
+typedef intrusive_list<Invitation, LocalUser> InviteList;
+
+template<typename T>
+inline void InviteBase<T>::ClearInvites()
+{
+       for (typename intrusive_list<Invitation, T>::iterator i = invites.begin(); i != invites.end(); )
+       {
+               Invitation* inv = *i;
+               ++i;
+               delete inv;
+       }
+}