Skip to content

Commit

Permalink
Make inspircds module class names not conflict because it confuses OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam- committed Jan 1, 2014
1 parent 6e6543d commit a374e24
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions modules/protocol/inspircd12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@ struct IRCDMessageUID : IRCDMessage
}
};

class ProtoInspIRCd : public Module
class ProtoInspIRCd12 : public Module
{
InspIRCd12Proto ircd_proto;
ExtensibleItem<bool> ssl;
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -1419,4 +1419,4 @@ class ProtoInspIRCd : public Module
}
};

MODULE_INIT(ProtoInspIRCd)
MODULE_INIT(ProtoInspIRCd12)
8 changes: 4 additions & 4 deletions modules/protocol/inspircd20.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ struct IRCDMessageFIdent : IRCDMessage
}
};

class ProtoInspIRCd : public Module
class ProtoInspIRCd20 : public Module
{
Module *m_insp12;

Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -739,7 +739,7 @@ class ProtoInspIRCd : public Module

}

~ProtoInspIRCd()
~ProtoInspIRCd20()
{
m_insp12 = ModuleManager::FindModule("inspircd12");
ModuleManager::UnloadModule(m_insp12, NULL);
Expand Down Expand Up @@ -827,4 +827,4 @@ class ProtoInspIRCd : public Module
}
};

MODULE_INIT(ProtoInspIRCd)
MODULE_INIT(ProtoInspIRCd20)

0 comments on commit a374e24

Please sign in to comment.