Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 1 commit into from
May 21, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Include/Common/GameMemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ class MemoryPoolObject

public:

static void deleteInstance(MemoryPoolObject* mpo)
static void deleteInstanceInternal(MemoryPoolObject* mpo)
{
if (mpo)
{
Expand All @@ -769,7 +769,7 @@ class MemoryPoolObject

inline void deleteInstance(MemoryPoolObject* mpo)
{
MemoryPoolObject::deleteInstance(mpo);
MemoryPoolObject::deleteInstanceInternal(mpo);
}


Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Include/Common/GameMemoryNull.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ class MemoryPoolObject

public:

static void deleteInstance(MemoryPoolObject* mpo)
static void deleteInstanceInternal(MemoryPoolObject* mpo)
{
if (mpo)
{
Expand All @@ -768,7 +768,7 @@ class MemoryPoolObject

inline void deleteInstance(MemoryPoolObject* mpo)
{
MemoryPoolObject::deleteInstance(mpo);
MemoryPoolObject::deleteInstanceInternal(mpo);
}


Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/Common/GameMemoryNull.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down