From 4d931c16adeba6f907d67150aa79e155b8e9fce0 Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Mon, 24 Nov 2014 12:36:46 -0600 Subject: [PATCH] Silence a few "zero as null pointer" warnings. --- Source/Core/Common/ArmEmitter.h | 2 +- Source/Core/Common/GekkoDisassembler.cpp | 4 ++-- Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp | 2 +- Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h index cde7e9db66..c4139b67c7 100644 --- a/Source/Core/Common/ArmEmitter.h +++ b/Source/Core/Common/ArmEmitter.h @@ -348,7 +348,7 @@ protected: inline void Write32(u32 value) {*(u32*)code = value; code+=4;} public: - ARMXEmitter() : code(0), startcode(0), lastCacheFlushEnd(0) { + ARMXEmitter() : code(nullptr), startcode(nullptr), lastCacheFlushEnd(nullptr) { condition = CC_AL << 28; } ARMXEmitter(u8 *code_ptr) { diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp index 15eb21e8bd..fe663d5d24 100644 --- a/Source/Core/Common/GekkoDisassembler.cpp +++ b/Source/Core/Common/GekkoDisassembler.cpp @@ -2285,7 +2285,7 @@ const char* GekkoDisassembler::GetGPRName(u32 index) if (index < 32) return gprnames[index]; - return 0; + return nullptr; } static const char* fprnames[] = @@ -2301,5 +2301,5 @@ const char* GekkoDisassembler::GetFPRName(u32 index) if (index < 32) return fprnames[index]; - return 0; + return nullptr; } diff --git a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp index 3dd1b59a9f..9bb2a3a774 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp @@ -9,7 +9,7 @@ using namespace ArmGen; ArmFPRCache::ArmFPRCache() { - emit = 0; + emit = nullptr; } void ArmFPRCache::Init(ARMXEmitter *emitter) diff --git a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp index cb11ed5644..8a7c2990a9 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp @@ -9,7 +9,7 @@ using namespace ArmGen; ArmRegCache::ArmRegCache() { - emit = 0; + emit = nullptr; } void ArmRegCache::Init(ARMXEmitter *emitter)