diff options
| author | Adam <Adam@anope.org> | 2013-05-05 03:30:08 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-05-05 03:30:08 -0400 |
| commit | 57c2b65f08c9c0658003a74a32c6506829e12b0b (patch) | |
| tree | 49883b790ed9f7cd395e0c6f2f62cc946d743635 /modules/commands/ms_staff.cpp | |
| parent | a118946e657b8a137502ff60c1f21c608cb44495 (diff) | |
Move module header files to include/modules to fix naming conflicts with system headers
Diffstat (limited to 'modules/commands/ms_staff.cpp')
| -rw-r--r-- | modules/commands/ms_staff.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp index f9d5e81e5..30ec92b16 100644 --- a/modules/commands/ms_staff.cpp +++ b/modules/commands/ms_staff.cpp @@ -12,9 +12,11 @@ /*************************************************************************/ #include "module.h" -#include "memoserv.h" -static ServiceReference<MemoServService> MemoServService("MemoServService", "MemoServ"); +namespace +{ + ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ"); +} class CommandMSStaff : public Command { @@ -27,7 +29,7 @@ class CommandMSStaff : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) anope_override { - if (!MemoServService) + if (!memoserv) return; const Anope::string &text = params[0]; @@ -43,10 +45,8 @@ class CommandMSStaff : public Command const NickCore *nc = it->second; if (source.nc != nc && nc->IsServicesOper()) - MemoServService->Send(source.GetNick(), nc->display, text, true); + memoserv->Send(source.GetNick(), nc->display, text, true); } - - return; } bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override @@ -67,8 +67,7 @@ class MSStaff : public Module MSStaff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsstaff(this) { - - if (!MemoServService) + if (!memoserv) throw ModuleException("No MemoServ!"); } }; |