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); }