From c6d49660677ad8c620fac1122f26104c9456c703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 9 Jul 2016 09:32:41 +0200 Subject: [PATCH] Make really sure we're not using the IRBlock copy constructor other than on Symbian. Turns out it ended up being used on Mac, and our asserts just debugprint and don't actually assert... --- Core/MIPS/IR/IRJit.h | 5 ++--- UI/CwCheatScreen.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Core/MIPS/IR/IRJit.h b/Core/MIPS/IR/IRJit.h index 70fc701731..b15b376956 100644 --- a/Core/MIPS/IR/IRJit.h +++ b/Core/MIPS/IR/IRJit.h @@ -51,15 +51,13 @@ public: b.const_ = nullptr; } +#ifdef __SYMBIAN32__ IRBlock(const IRBlock &b) { *this = b; } IRBlock &operator=(const IRBlock &b) { // No std::move on Symbian... But let's try not to use elsewhere. -#ifndef __SYMBIAN32__ - _assert_(false); -#endif numInstructions_ = b.numInstructions_; numConstants_ = b.numConstants_; instr_ = new IRInst[numInstructions_]; @@ -76,6 +74,7 @@ public: return *this; } +#endif ~IRBlock() { delete[] instr_; diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index 4c683a0e93..ecb1f35010 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -59,7 +59,7 @@ void CwCheatScreen::CreateCodeList() { for (int i = 0; i < extension.size(); i++) { extension[i] = tolower(extension[i]); } - if (extension != "iso" && extension != "cso" && extension != "pbp" || gameTitle == "") { + if ((extension != "iso" && extension != "cso" && extension != "pbp") || gameTitle == "") { if (extension == "elf") { gameTitle = "ELF000000"; } else {