diff options
| author | Adam <Adam@anope.org> | 2014-01-01 16:21:38 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-01-01 16:21:38 -0500 |
| commit | a374e245fd257205e90e133044d014d024c3062e (patch) | |
| tree | 1c72c6f0d717aba0ad76e728dde216247f962f64 | |
| parent | 6e6543d3ed3fda9ff62268dea426709801927dc5 (diff) | |
Make inspircds module class names not conflict because it confuses OSX
| -rw-r--r-- | modules/protocol/inspircd12.cpp | 6 | ||||
| -rw-r--r-- | modules/protocol/inspircd20.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 1d3605c88..653aece2e 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -1342,7 +1342,7 @@ struct IRCDMessageUID : IRCDMessage } }; -class ProtoInspIRCd : public Module +class ProtoInspIRCd12 : public Module { InspIRCd12Proto ircd_proto; ExtensibleItem<bool> ssl; @@ -1386,7 +1386,7 @@ class ProtoInspIRCd : public Module IRCDMessageUID message_uid; public: - ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR), + ProtoInspIRCd12(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR), ircd_proto(this), ssl(this, "ssl"), message_away(this), message_error(this), message_invite(this), message_join(this), message_kick(this), message_kill(this), message_motd(this), message_notice(this), message_part(this), message_ping(this), message_privmsg(this), message_quit(this), @@ -1419,4 +1419,4 @@ class ProtoInspIRCd : public Module } }; -MODULE_INIT(ProtoInspIRCd) +MODULE_INIT(ProtoInspIRCd12) diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 633a804ad..aa0288b4b 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -662,7 +662,7 @@ struct IRCDMessageFIdent : IRCDMessage } }; -class ProtoInspIRCd : public Module +class ProtoInspIRCd20 : public Module { Module *m_insp12; @@ -703,7 +703,7 @@ class ProtoInspIRCd : public Module } public: - ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR), + ProtoInspIRCd20(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR), ircd_proto(this), message_away(this), message_error(this), message_invite(this), message_join(this), message_kick(this), message_kill(this), message_motd(this), message_notice(this), message_part(this), message_ping(this), @@ -739,7 +739,7 @@ class ProtoInspIRCd : public Module } - ~ProtoInspIRCd() + ~ProtoInspIRCd20() { m_insp12 = ModuleManager::FindModule("inspircd12"); ModuleManager::UnloadModule(m_insp12, NULL); @@ -827,4 +827,4 @@ class ProtoInspIRCd : public Module } }; -MODULE_INIT(ProtoInspIRCd) +MODULE_INIT(ProtoInspIRCd20) |