Merge branch 'master+gnutlsprio'

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

diff --git a/include/channels.h b/include/channels.h
index 95c516a057db9173c2b73f7f788712e545864031..be84ac8009736510e031fa892a34c4cd51d1a6ed 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -34,12 +34,12 @@
  * This class represents a channel, and contains its name, modes, topic, topic set time,
  * etc, and an instance of the BanList type.
  */
-class CoreExport Channel : public Extensible, public InviteBase<Channel>
+class CoreExport Channel : public Extensible
 {
  public:
        /** A map of Memberships on a channel keyed by User pointers
         */
-       typedef std::map<User*, Membership*> MemberMap;
+       typedef std::map<User*, insp::aligned_storage<Membership> > MemberMap;
 
  private:
        /** Set default modes for the channel on creation
@@ -57,9 +57,9 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
         * This function does not remove the channel from User::chanlist.
         * Since the parameter is an iterator to the target, the complexity
         * of this function is constant.
-        * @param membiter The UserMembIter to remove, must be valid
+        * @param membiter The MemberMap iterator to remove, must be valid
         */
-       void DelUser(const UserMembIter& membiter);
+       void DelUser(const MemberMap::iterator& membiter);
 
  public:
        /** Creates a channel record and initialises it with default values
@@ -187,7 +187,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
         * @param victimiter Iterator to the user being kicked, must be valid
         * @param reason The reason for the kick
         */
-       void KickUser(User* src, const UserMembIter& victimiter, const std::string& reason);
+       void KickUser(User* src, const MemberMap::iterator& victimiter, const std::string& reason);
 
        /** Make src kick user from this channel with the given reason.
         * @param src The source of the kick
@@ -196,7 +196,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
         */
        void KickUser(User* src, User* user, const std::string& reason)
        {
-               UserMembIter it = userlist.find(user);
+               MemberMap::iterator it = userlist.find(user);
                if (it != userlist.end())
                        KickUser(src, it, reason);
        }
@@ -305,12 +305,6 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel>
         */
        const char* ChanModes(bool showkey);
 
-       /** Spool the NAMES list for this channel to the given user
-        * @param user The user to spool the NAMES list to
-        * @param isinside If true, the user is inside the channel, if not then false
-        */
-       void UserList(User* user, bool isinside = true);
-
        /** Get the value of a users prefix on this channel.
         * @param user The user to look up
         * @return The module or core-defined value of the users prefix.