Remove classbase inheritance from Invitation

3 files changed, 1 insertions, 4 deletions

diff --git a/include/membership.h b/include/membership.h
index b0924bef7..723449419 100644
--- a/include/membership.h
+++ b/include/membership.h
@@ -56,7 +56,7 @@ class CoreExport InviteBase
 	friend class Invitation;
 };
 
-class CoreExport Invitation : public classbase
+class CoreExport Invitation
 {
 	Invitation(Channel* c, LocalUser* u, time_t timeout) : user(u), chan(c), expiry(timeout) {}
 
diff --git a/src/channels.cpp b/src/channels.cpp
index 7763febd5..51a8f5625 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -853,7 +853,6 @@ Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
 			std::string expiration = InspIRCd::TimeString(inv->expiry);
 			ServerInstance->Logs->Log("INVITATION", LOG_DEBUG, "Invitation::Find ecountered expired entry: %p expired %s", (void*) inv, expiration.c_str());
 			i = locallist.erase(i);
-			inv->cull();
 			delete inv;
 		}
 		else
@@ -891,7 +890,6 @@ void InviteBase::ClearInvites()
 	locallist.swap(invites);
 	for (InviteList::const_iterator i = locallist.begin(); i != locallist.end(); ++i)
 	{
-		(*i)->cull();
 		delete *i;
 	}
 }
diff --git a/src/users.cpp b/src/users.cpp
index 6ec46883f..32ae87389 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -156,7 +156,6 @@ bool LocalUser::RemoveInvite(Channel* chan)
 	Invitation* inv = Invitation::Find(chan, this);
 	if (inv)
 	{
-		inv->cull();
 		delete inv;
 		return true;
 	}