diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/helperfuncs.cpp | 2 | ||||
| -rw-r--r-- | src/inspircd.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_channames.cpp | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 719454742..a24401542 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -193,7 +193,7 @@ void InspIRCd::ProcessColors(file_cache& input) } /* true for valid channel name, false else */ -bool IsChannelHandler::Call(const std::string& chname) +bool InspIRCd::DefaultIsChannel(const std::string& chname) { if (chname.empty() || chname.length() > ServerInstance->Config->Limits.ChanMax) return false; diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 542789c7e..5f7dfd06f 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -227,7 +227,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : * themselves within the class. */ GenRandom(&HandleGenRandom), - IsChannel(&HandleIsChannel), + IsChannel(&DefaultIsChannel), IsNick(&DefaultIsNick), IsIdent(&DefaultIsIdent) { diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index b23148b44..d0d122b43 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -21,10 +21,10 @@ static std::bitset<256> allowedmap; -class NewIsChannelHandler : public HandlerBase1<bool, const std::string&> +class NewIsChannelHandler { public: - bool Call(const std::string&) CXX11_OVERRIDE; + static bool Call(const std::string&); }; bool NewIsChannelHandler::Call(const std::string& channame) @@ -44,8 +44,7 @@ bool NewIsChannelHandler::Call(const std::string& channame) class ModuleChannelNames : public Module { - NewIsChannelHandler myhandler; - caller1<bool, const std::string&> rememberer; + TR1NS::function<bool(const std::string&)> rememberer; bool badchan; ChanModeReference permchannelmode; @@ -59,7 +58,7 @@ class ModuleChannelNames : public Module void init() CXX11_OVERRIDE { - ServerInstance->IsChannel = &myhandler; + ServerInstance->IsChannel = NewIsChannelHandler::Call; } void ValidateChans() |