From da45f24ff1ab4fbac1b674c820796e9b3850a380 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Fri, 14 Mar 2014 12:59:19 +0100
Subject: Change allocation of InspIRCd::chanlist to be physically part of the
 object containing it

---
 src/channels.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/channels.cpp')

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();
-- 
cgit v1.3.1-10-gc9f91