Use the same object for chanusercontainer and userchancontainer

2 files changed, 6 insertions, 6 deletions

diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp
index 350280caa..ba7db4654 100644
--- a/modules/pseudoclients/memoserv.cpp
+++ b/modules/pseudoclients/memoserv.cpp
@@ -99,9 +99,9 @@ class MyMemoServService : public MemoServService
 
 			if (ci->c)
 			{
-				for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
+				for (Channel::ChanUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
 				{
-					UserContainer *cu = *it;
+					ChanUserContainer *cu = *it;
 
 					if (ci->AccessFor(cu->user).HasPriv("MEMO"))
 					{
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index 744339f7d..dd7efcabc 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -247,9 +247,9 @@ class NickServCore : public Module
 		}
 
 		if (Config->NSModeOnID)
-			for (UChannelList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
+			for (User::ChanUserList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
 			{
-				ChannelContainer *cc = *it;
+				ChanUserContainer *cc = *it;
 				Channel *c = cc->chan;
 				if (c)
 					c->SetCorrectModes(u, true, true);
@@ -286,9 +286,9 @@ class NickServCore : public Module
 
 	void OnNickUpdate(User *u) anope_override
 	{
-		for (UChannelList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
+		for (User::ChanUserList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
 		{
-			ChannelContainer *cc = *it;
+			ChanUserContainer *cc = *it;
 			Channel *c = cc->chan;
 			if (c)
 				c->SetCorrectModes(u, true, true);