diff --git a/Common/StringUtil.cpp b/Common/StringUtil.cpp index a476524e34..5dae0a5d7f 100644 --- a/Common/StringUtil.cpp +++ b/Common/StringUtil.cpp @@ -139,15 +139,12 @@ bool TryParse(const std::string &str, u32 *const output) if (ULONG_MAX > UINT_MAX) { #ifdef _MSC_VER -#pragma warning disable(4309); +#pragma warning (disable:4309) #endif // Note: The typecasts avoid GCC warnings when long is 32 bits wide. if (value >= static_cast(0x100000000ull) && value <= static_cast(0xFFFFFFFF00000000ull)) return false; -#ifdef _MSC_VER -#pragma warning enable(4309); -#endif } *output = static_cast(value); diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 00c2f72712..5512e6c1d6 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -544,7 +544,7 @@ void __KernelScheduleWakeup(SceUID threadID, int usFromNow) void __KernelRemoveFromThreadQueue(Thread *t) { - for (int i = 0; i < threadqueue.size(); i++) + for (size_t i = 0; i < threadqueue.size(); i++) { if (threadqueue[i] == t) { @@ -628,7 +628,7 @@ void sceKernelCheckThreadStack() { u32 error; Thread *t = kernelObjects.Get(__KernelGetCurThread(), error); - u32 diff = abs((s64)t->stackBlock - (s64)currentMIPS->r[MIPS_REG_SP]); + u32 diff = (u32)abs((s64)t->stackBlock - (s64)currentMIPS->r[MIPS_REG_SP]); ERROR_LOG(HLE, "%i=sceKernelCheckThreadStack()", diff); RETURN(diff); //Blatant lie } diff --git a/Core/MIPS/MIPSIntVFPU.cpp b/Core/MIPS/MIPSIntVFPU.cpp index cf24cd4a1d..93852daa9b 100644 --- a/Core/MIPS/MIPSIntVFPU.cpp +++ b/Core/MIPS/MIPSIntVFPU.cpp @@ -826,7 +826,7 @@ namespace MIPSInt { switch ((op >> 16) & 0x1f) { - case 1: d[i] = currentMIPS->rng.R32(); break; // vrndi - TODO: copy bits instead? + case 1: d[i] = (float)currentMIPS->rng.R32(); break; // vrndi - TODO: copy bits instead? case 2: d[i] = 1.0f + ((float)currentMIPS->rng.R32() / 0xFFFFFFFF); break; // vrndf1 TODO: make more accurate case 3: d[i] = 2.0f + 2 * ((float)currentMIPS->rng.R32() / 0xFFFFFFFF); break; // vrndf2 TODO: make more accurate case 4: d[i] = 0.0f; // Should not get here