[GEN][ZH] Remove the now obsolete MEMORY_POOL_DELETEINSTANCE_VISIBILITY macro (#870)

Author: xezon

Generals/Code/GameEngine/Include/Common/GameMemory.h

@@ -914,22 +914,6 @@ class MemoryPoolObjectHolder
 };
 
 
-// ----------------------------------------------------------------------------
-/**
-	Sometimes you want to make a class's destructor protected so that it can only
-	be destroyed under special circumstances. MemoryPoolObject short-circuits this
-	by making the destructor always be protected, and the true delete technique
-	(namely, deleteInstance) always public by default. You can simulate the behavior
-	you really want by including this macro 
-*/
-#define MEMORY_POOL_DELETEINSTANCE_VISIBILITY(ARGVIS)\
-ARGVIS: \
-	static void deleteInstance(MemoryPoolObject* object) { \
-		MemoryPoolObject::deleteInstance(object); \
-	} \
-public: 
-
-
 #define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { }
 
 #endif // _GAME_MEMORY_H_

Generals/Code/GameEngine/Include/GameLogic/Object.h

@@ -158,8 +158,6 @@ class Object : public Thing, public Snapshot
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Object, "ObjectPool" )		
-	/// destructor is non-public in order to require the use of TheGameLogic->destroyObject()
-	MEMORY_POOL_DELETEINSTANCE_VISIBILITY(protected)
 
 public:
 
@@ -765,6 +763,9 @@ class Object : public Thing, public Snapshot
 
 };  // end class Object
 
+// deleteInstance is not meant to be used with Object in order to require the use of TheGameLogic->destroyObject()
+void deleteInstance(Object* object) CPP_11(= delete);
+
 // describe an object as an AsciiString: e.g. "Object 102 (KillerBuggy) [GLARocketBuggy, owned by player 2 (GLAIntroPlayer)]"
 AsciiString DebugDescribeObject(const Object *obj);
 

GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h

@@ -912,21 +912,6 @@ class MemoryPoolObjectHolder
 };
 
 
-/**
-	Sometimes you want to make a class's destructor protected so that it can only
-	be destroyed under special circumstances. MemoryPoolObject short-circuits this
-	by making the destructor always be protected, and the true delete technique
-	(namely, deleteInstance) always public by default. You can simulate the behavior
-	you really want by including this macro 
-*/
-#define MEMORY_POOL_DELETEINSTANCE_VISIBILITY(ARGVIS)\
-ARGVIS: \
-	static void deleteInstance(MemoryPoolObject* object) { \
-		MemoryPoolObject::deleteInstance(object); \
-	} \
-public: 
-
-
 #define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { }
 
 

GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h

@@ -164,8 +164,6 @@ class Object : public Thing, public Snapshot
 {
 
 	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Object, "ObjectPool" )		
-	/// destructor is non-public in order to require the use of TheGameLogic->destroyObject()
-	MEMORY_POOL_DELETEINSTANCE_VISIBILITY(protected)
 
 public:
 
@@ -811,6 +809,9 @@ class Object : public Thing, public Snapshot
 
 };  // end class Object
 
+// deleteInstance is not meant to be used with Object in order to require the use of TheGameLogic->destroyObject()
+void deleteInstance(Object* object) CPP_11(= delete);
+
 // describe an object as an AsciiString: e.g. "Object 102 (KillerBuggy) [GLARocketBuggy, owned by player 2 (GLAIntroPlayer)]"
 AsciiString DebugDescribeObject(const Object *obj);