Add server ports to ServerInstance->ports, enable SSL on them using OnHookIO

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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 536c42937d2493f1649c7cc2c1e510598ce3ef9b..6cbc14850d00b6474f4ec2752b6917f925b8fc67 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -251,8 +251,6 @@ namespace irc
        class CoreExport modestacker : public classbase
        {
         private:
-               InspIRCd* ServerInstance;
-
                /** The mode sequence and its parameters
                 */
                std::deque<std::string> sequence;
@@ -268,7 +266,7 @@ namespace irc
                 * @param add True if the stack is adding modes,
                 * false if it is removing them
                 */
-               modestacker(InspIRCd* Instance, bool add);
+               modestacker(bool add);
 
                /** Push a modeletter and its parameter onto the stack.
                 * No checking is performed as to if this mode actually
@@ -304,7 +302,7 @@ namespace irc
                 * characters. As specified below, this function
                 * should be called in a loop until it returns zero,
                 * indicating there are no more modes to return.
-                * @param result The deque to populate. This will
+                * @param result The vector to populate. This will not
                 * be cleared before it is used.
                 * @param max_line_size The maximum size of the line
                 * to build, in characters, seperate to MAXMODES.
@@ -313,7 +311,16 @@ namespace irc
                 * returns 0, in case there are multiple lines of
                 * mode changes to be obtained.
                 */
-               int GetStackedLine(std::deque<std::string> &result, int max_line_size = 360);
+               int GetStackedLine(std::vector<std::string> &result, int max_line_size = 360);
+
+               /** deprecated compatability interface - TODO remove */
+               int GetStackedLine(std::deque<std::string> &result, int max_line_size = 360) {
+                       std::vector<std::string> r;
+                       int n = GetStackedLine(r, max_line_size);
+                       result.clear();
+                       result.insert(result.end(), r.begin(), r.end());
+                       return n;
+               }
        };
 
        /** irc::tokenstream reads a string formatted as per RFC1459 and RFC2812.