Revert "Isolate JKRHeap operator overloads" (#39)

This commit is contained in:
TakaRikka
2026-03-06 19:49:35 -08:00
committed by GitHub
parent b7c482fb87
commit 78d4169929
630 changed files with 3349 additions and 3452 deletions
+3 -3
View File
@@ -54,7 +54,7 @@ JKRCompArchive::~JKRCompArchive() {
}
if (mDvdFile != NULL) {
JKR_DELETE(mDvdFile);
delete mDvdFile;
}
sVolumeList.remove(&mFileLoaderLink);
@@ -73,7 +73,7 @@ bool JKRCompArchive::open(s32 entryNum) {
mFiles = NULL;
mStringTable = NULL;
mDvdFile = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRDvdFile(entryNum);
mDvdFile = new (JKRGetSystemHeap(), 0) JKRDvdFile(entryNum);
if(mDvdFile == NULL) {
mMountMode = 0;
return 0;
@@ -216,7 +216,7 @@ bool JKRCompArchive::open(s32 entryNum) {
if (mMountMode == 0) {
OS_REPORT(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567);
if(mDvdFile != NULL) {
JKR_DELETE(mDvdFile);
delete mDvdFile;
}
return false;
}