From b550ccfc73799af436e3cc9969122b7dfb41f888 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 27 Apr 2014 20:27:36 -0700 Subject: [PATCH] Make MemoryBase::Unmap() return a value. --- rpcs3/Emu/Memory/Memory.h | 3 +++ rpcs3/Emu/Memory/MemoryBlock.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h index 7bb7729177..6a5be2257d 100644 --- a/rpcs3/Emu/Memory/Memory.h +++ b/rpcs3/Emu/Memory/Memory.h @@ -474,6 +474,7 @@ public: bool Unmap(const u64 addr) { + bool result = false; for(uint i=0; iIsMirror()) @@ -482,9 +483,11 @@ public: { delete MemoryBlocks[i]; MemoryBlocks.erase(MemoryBlocks.begin() + i); + return true; } } } + return false; } u8* operator + (const u64 vaddr) diff --git a/rpcs3/Emu/Memory/MemoryBlock.h b/rpcs3/Emu/Memory/MemoryBlock.h index 8716b3f37f..3813341803 100644 --- a/rpcs3/Emu/Memory/MemoryBlock.h +++ b/rpcs3/Emu/Memory/MemoryBlock.h @@ -28,7 +28,7 @@ struct MemBlockInfo : public MemInfo { if(!mem) { - ConLog.Error("Not enought free memory."); + ConLog.Error("Not enough free memory."); assert(0); } memset(mem, 0, size);