summaryrefslogtreecommitdiff
path: root/src/channels.cpp
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-03-14 12:59:19 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-03-14 12:59:19 +0100
commitda45f24ff1ab4fbac1b674c820796e9b3850a380 (patch)
treecae234ce6d5c645252587c22718bc23a8241f3ab /src/channels.cpp
parent146d85b5dea9ecb803a9a47c68b5489905634125 (diff)
Change allocation of InspIRCd::chanlist to be physically part of the object containing it
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 99c25fbfc..fcfb524ce 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -42,7 +42,7 @@ namespace
Channel::Channel(const std::string &cname, time_t ts)
: name(cname), age(ts), topicset(0)
{
- if (!ServerInstance->chanlist->insert(std::make_pair(cname, this)).second)
+ if (!ServerInstance->chanlist.insert(std::make_pair(cname, this)).second)
throw CoreException("Cannot create duplicate channel " + cname);
}
@@ -88,12 +88,12 @@ void Channel::CheckDestroy()
if (res == MOD_RES_DENY)
return;
- chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
+ chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
/* kill the record */
- if (iter != ServerInstance->chanlist->end())
+ if (iter != ServerInstance->chanlist.end())
{
FOREACH_MOD(OnChannelDelete, (this));
- ServerInstance->chanlist->erase(iter);
+ ServerInstance->chanlist.erase(iter);
}
ClearInvites();