From 288d86758889cd7afd77a1c37efa3418be9fb401 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 21 May 2014 08:00:31 -0700 Subject: [PATCH] Fix a type comparison warning. --- Core/HLE/sceGe.cpp | 4 ++-- Core/MIPS/x86/JitSafeMem.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp index 8197c6019..80e377f65 100644 --- a/Core/HLE/sceGe.cpp +++ b/Core/HLE/sceGe.cpp @@ -390,9 +390,9 @@ bool __GeTriggerWait(WaitType waitType, SceUID waitId, WaitingThreadList &waitin bool __GeTriggerWait(GPUSyncType type, SceUID waitId) { // We check for the old type for old savestate compatibility. - if (type == GPU_SYNC_DRAW || type == WAITTYPE_GEDRAWSYNC) + if (type == GPU_SYNC_DRAW || (WaitType)type == WAITTYPE_GEDRAWSYNC) return __GeTriggerWait(WAITTYPE_GEDRAWSYNC, waitId, drawWaitingThreads); - else if (type == GPU_SYNC_LIST || type == WAITTYPE_GELISTSYNC) + else if (type == GPU_SYNC_LIST || (WaitType)type == WAITTYPE_GELISTSYNC) return __GeTriggerWait(WAITTYPE_GELISTSYNC, waitId, listWaitingThreads[waitId]); else ERROR_LOG_REPORT(SCEGE, "__GeTriggerWait: bad wait type"); diff --git a/Core/MIPS/x86/JitSafeMem.cpp b/Core/MIPS/x86/JitSafeMem.cpp index c4e83c84c..670af75d9 100644 --- a/Core/MIPS/x86/JitSafeMem.cpp +++ b/Core/MIPS/x86/JitSafeMem.cpp @@ -15,8 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#pragma once - #include "Core/Config.h" #include "Core/Debugger/Breakpoints.h" #include "Core/MemMap.h"