From 12b9855339a3bbd05cc0636588ea68bf8db390f5 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 4 Nov 2007 21:24:40 +0000
Subject: Honking huge commit. Removal of DELETE() template that never worked
 right anyway

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8527 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/extra/m_mysql.cpp       |  4 ++--
 src/modules/extra/m_pgsql.cpp       | 14 +++++++-------
 src/modules/extra/m_sqlite3.cpp     |  4 ++--
 src/modules/extra/m_ssl_gnutls.cpp  |  6 +++---
 src/modules/extra/m_ssl_openssl.cpp |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/modules/extra')

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index a033d13e7..25b54c258 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -512,7 +512,7 @@ void ClearOldConnections(ConfigReader* conf)
 	{
 		if (!HostInConf(conf, i->second->GetConfHost()))
 		{
-			DELETE(i->second);
+			delete i->second;
 			safei = i;
 			--i;
 			Connections.erase(safei);
@@ -526,7 +526,7 @@ void ClearAllConnections()
 	while ((i = Connections.begin()) != Connections.end())
 	{
 		Connections.erase(i);
-		DELETE(i->second);
+		delete i->second;
 	}
 }
 
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 434f30539..17dc4e12f 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -143,10 +143,10 @@ public:
 	{
 		/* If we allocated these, free them... */
 		if(fieldlist)
-			DELETE(fieldlist);
+			delete fieldlist;
 
 		if(fieldmap)
-			DELETE(fieldmap);
+			delete fieldmap;
 
 		PQclear(res);
 	}
@@ -301,12 +301,12 @@ public:
 
 	virtual void Free(SQLfieldMap* fm)
 	{
-		DELETE(fm);
+		delete fm;
 	}
 
 	virtual void Free(SQLfieldList* fl)
 	{
-		DELETE(fl);
+		delete fl;
 	}
 };
 
@@ -862,7 +862,7 @@ class ModulePgSQL : public Module
 		{
 			if (!HostInConf(iter->second->GetConfHost()))
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				safei = iter;
 				--iter;
 				connections.erase(safei);
@@ -876,7 +876,7 @@ class ModulePgSQL : public Module
 		while ((i = connections.begin()) != connections.end())
 		{
 			connections.erase(i);
-			DELETE(i->second);
+			delete i->second;
 		}
 	}
 
@@ -902,7 +902,7 @@ class ModulePgSQL : public Module
 		{
 			if (conn == iter->second)
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				connections.erase(iter);
 				break;
 			}
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 091340d54..9607cb4dd 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -594,7 +594,7 @@ class ModuleSQLite3 : public Module
 		{
 			if (!HostInConf(iter->second->GetConfHost()))
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				safei = iter;
 				--iter;
 				connections.erase(safei);
@@ -608,7 +608,7 @@ class ModuleSQLite3 : public Module
 		while ((i = connections.begin()) != connections.end())
 		{
 			connections.erase(i);
-			DELETE(i->second);
+			delete i->second;
 		}
 	}
 
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 1c56e9660..3026d6935 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -224,7 +224,7 @@ class ModuleSSLGnuTLS : public Module
 		// This may be on a large (once a day or week) timer eventually.
 		GenerateDHParams();
 
-		DELETE(Conf);
+		delete Conf;
 	}
 
 	void GenerateDHParams()
@@ -688,8 +688,8 @@ class ModuleSSLGnuTLS : public Module
 			metadata->push_back("ON");		// The value to send
 			Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
 			event->Send(ServerInstance);		// Trigger the event. We don't care what module picks it up.
-			DELETE(event);
-			DELETE(metadata);
+			delete event;
+			delete metadata;
 
 			VerifyCertificate(&sessions[user->GetFd()],user);
 			if (sessions[user->GetFd()].sess)
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 2a81aed72..d38b85058 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -787,8 +787,8 @@ class ModuleSSLOpenSSL : public Module
 			metadata->push_back("ON");		// The value to send
 			Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
 			event->Send(ServerInstance);		// Trigger the event. We don't care what module picks it up.
-			DELETE(event);
-			DELETE(metadata);
+			delete event;
+			delete metadata;
 
 			VerifyCertificate(&sessions[user->GetFd()], user);
 			if (sessions[user->GetFd()].sess)
-- 
cgit v1.2.3