Allow the maximum length of a chanfilter message to be configured.

[user/henk/code/inspircd.git] / src / modules / m_monitor.cpp

diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index b2e06f191df7858abced7d89bbe7fc9a4440135a..af792743a0c2fecea612964716ac9601da04777d 100644 (file)
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -82,7 +82,7 @@ class IRCv3::Monitor::Manager
                        free(unset_raw(container));
                }
 
-               std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
+               std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
                {
                        std::string ret;
                        if (format == FORMAT_NETWORK)
@@ -99,9 +99,9 @@ class IRCv3::Monitor::Manager
                        return ret;
                }
 
-               void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+               void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 
-               void free(void* item)
+               void free(void* item) CXX11_OVERRIDE
                {
                        delete static_cast<ExtData*>(item);
                }
@@ -245,7 +245,8 @@ class IRCv3::Monitor::Manager
        WatchedList emptywatchedlist;
 };
 
-void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+// inline is needed in static builds to support m_watch including the Manager code from this file
+inline void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 {
        if (format == FORMAT_NETWORK)
                return;
@@ -318,7 +319,7 @@ class CommandMonitor : public SplitCommand
                syntax = "[C|L|S|+ <nick1>[,<nick2>]|- <nick1>[,<nick2>]";
        }
 
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE
        {
                char subcmd = toupper(parameters[0][0]);
                if (subcmd == '+')