Merge v2.0.23 and v2.0.24 into master.

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

diff --git a/include/membership.h b/include/membership.h
index 05d6b3796fb1ac72e44a035117d927077b4878f0..c952d09ae88f5859a7e8f3d6655383354ab19d0c 100644 (file)
--- a/include/membership.h
+++ b/include/membership.h
@@ -70,13 +70,13 @@ class CoreExport Membership : public Extensible, public insp::intrusive_list_nod
         */
        Membership(User* u, Channel* c) : user(u), chan(c) {}
 
-       /** Returns true if this member has a given prefix mode set
-        * @param m The prefix mode letter to check
+       /** Check if this member has a given prefix mode set
+        * @param pm Prefix mode to check
         * @return True if the member has the prefix mode set, false otherwise
         */
-       inline bool hasMode(char m) const
+       bool HasMode(const PrefixMode* pm) const
        {
-               return modes.find(m) != std::string::npos;
+               return (modes.find(pm->GetModeChar()) != std::string::npos);
        }
 
        /** Returns the rank of this member.
@@ -110,5 +110,5 @@ class CoreExport Membership : public Extensible, public insp::intrusive_list_nod
         * be in rank order, greatest first, as certain IRC clients require
         * this when multiple prefixes are used names lists.
         */
-       const char* GetAllPrefixChars() const;
+       std::string GetAllPrefixChars() const;
 };