[GEN][ZH] Rename MemoryPoolObject::deleteInstance to MemoryPoolObject::deleteInstanceInternal (#889)

xezon · web-flow · commit 95980dc8fb94 · 2025-05-21T16:22:35.000+02:00
diff --git 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
@@ -108,15 +108,15 @@ class MemoryPoolObject
 
 public:
 
-	static void deleteInstance(MemoryPoolObject* mpo) 
+	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
 	{
 		delete mpo;
 	}
 };
 
 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
@@ -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
@@ -108,15 +108,15 @@ class MemoryPoolObject
 
 public:
 
-	static void deleteInstance(MemoryPoolObject* mpo) 
+	static void deleteInstanceInternal(MemoryPoolObject* mpo) 
 	{
 		delete mpo;
 	}
 };
 
 inline void deleteInstance(MemoryPoolObject* mpo)
 {
-	MemoryPoolObject::deleteInstance(mpo);
+	MemoryPoolObject::deleteInstanceInternal(mpo);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,7 @@ class MemoryPoolObject`
`756`	`756`
`757`	`757`	`public:`
`758`	`758`
`759`		`- static void deleteInstance(MemoryPoolObject* mpo)`
	`759`	`+ static void deleteInstanceInternal(MemoryPoolObject* mpo)`
`760`	`760`	`{`
`761`	`761`	`if (mpo)`
`762`	`762`	`{`
`@@ -769,7 +769,7 @@ class MemoryPoolObject`
`769`	`769`
`770`	`770`	`inline void deleteInstance(MemoryPoolObject* mpo)`
`771`	`771`	`{`
`772`		`- MemoryPoolObject::deleteInstance(mpo);`
	`772`	`+ MemoryPoolObject::deleteInstanceInternal(mpo);`
`773`	`773`	`}`
`774`	`774`
`775`	`775`
Original file line number	Diff line number	Diff line change
`@@ -108,15 +108,15 @@ class MemoryPoolObject`
`108`	`108`
`109`	`109`	`public:`
`110`	`110`
`111`		`- static void deleteInstance(MemoryPoolObject* mpo)`
	`111`	`+ static void deleteInstanceInternal(MemoryPoolObject* mpo)`
`112`	`112`	`{`
`113`	`113`	`delete mpo;`
`114`	`114`	`}`
`115`	`115`	`};`
`116`	`116`
`117`	`117`	`inline void deleteInstance(MemoryPoolObject* mpo)`
`118`	`118`	`{`
`119`		`- MemoryPoolObject::deleteInstance(mpo);`
	`119`	`+ MemoryPoolObject::deleteInstanceInternal(mpo);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ class MemoryPoolObject`
`755`	`755`
`756`	`756`	`public:`
`757`	`757`
`758`		`- static void deleteInstance(MemoryPoolObject* mpo)`
	`758`	`+ static void deleteInstanceInternal(MemoryPoolObject* mpo)`
`759`	`759`	`{`
`760`	`760`	`if (mpo)`
`761`	`761`	`{`
`@@ -768,7 +768,7 @@ class MemoryPoolObject`
`768`	`768`
`769`	`769`	`inline void deleteInstance(MemoryPoolObject* mpo)`
`770`	`770`	`{`
`771`		`- MemoryPoolObject::deleteInstance(mpo);`
	`771`	`+ MemoryPoolObject::deleteInstanceInternal(mpo);`
`772`	`772`	`}`
`773`	`773`
`774`	`774`