From fb5b122209dbbbb74706af9601ed37b85a37b5f9 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Tue, 20 May 2025 23:51:07 +0200
Subject: [PATCH] [GEN][ZH] Rename MemoryPoolObject::deleteInstance to
 MemoryPoolObject::deleteInstanceInternal

---
 Generals/Code/GameEngine/Include/Common/GameMemory.h       | 4 ++--
 Generals/Code/GameEngine/Include/Common/GameMemoryNull.h   | 4 ++--
 GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h     | 4 ++--
 GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Generals/Code/GameEngine/Include/Common/GameMemory.h b/Generals/Code/GameEngine/Include/Common/GameMemory.h
index 42b3a6cff51..21d41e77300 100644
--- a/Generals/Code/GameEngine/Include/Common/GameMemory.h
+++ b/Generals/Code/GameEngine/Include/Common/GameMemory.h
@@ -756,7 +756,7 @@ class MemoryPoolObject
 	
 public: 
 
-	static void deleteInstance(MemoryPoolObject* mpo) 
+	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
 	{	
 		if (mpo)
 		{
@@ -769,7 +769,7 @@ class MemoryPoolObject
 
 inline void deleteInstance(MemoryPoolObject* mpo)
 {
-	MemoryPoolObject::deleteInstance(mpo);
+	MemoryPoolObject::deleteInstanceInternal(mpo);
 }
 
 
diff --git a/Generals/Code/GameEngine/Include/Common/GameMemoryNull.h b/Generals/Code/GameEngine/Include/Common/GameMemoryNull.h
index c840b63c6e9..38de891775f 100644
--- a/Generals/Code/GameEngine/Include/Common/GameMemoryNull.h
+++ b/Generals/Code/GameEngine/Include/Common/GameMemoryNull.h
@@ -108,7 +108,7 @@ class MemoryPoolObject
 
 public:
 
-	static void deleteInstance(MemoryPoolObject* mpo) 
+	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
 	{
 		delete mpo;
 	}
@@ -116,7 +116,7 @@ class MemoryPoolObject
 
 inline void deleteInstance(MemoryPoolObject* mpo)
 {
-	MemoryPoolObject::deleteInstance(mpo);
+	MemoryPoolObject::deleteInstanceInternal(mpo);
 }
 
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h b/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h
index 43db762c669..557d4ffbc7b 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h
@@ -755,7 +755,7 @@ class MemoryPoolObject
 	
 public: 
 
-	static void deleteInstance(MemoryPoolObject* mpo) 
+	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
 	{	
 		if (mpo)
 		{
@@ -768,7 +768,7 @@ class MemoryPoolObject
 
 inline void deleteInstance(MemoryPoolObject* mpo)
 {
-	MemoryPoolObject::deleteInstance(mpo);
+	MemoryPoolObject::deleteInstanceInternal(mpo);
 }
 
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h b/GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h
index c840b63c6e9..38de891775f 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h
@@ -108,7 +108,7 @@ class MemoryPoolObject
 
 public:
 
-	static void deleteInstance(MemoryPoolObject* mpo) 
+	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
 	{
 		delete mpo;
 	}
@@ -116,7 +116,7 @@ class MemoryPoolObject
 
 inline void deleteInstance(MemoryPoolObject* mpo)
 {
-	MemoryPoolObject::deleteInstance(mpo);
+	MemoryPoolObject::deleteInstanceInternal(mpo);
 }