From 60b3fc01a2377e51d5d8acb497c75f41daf14030 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 11 Sep 2015 14:50:10 -0400
Subject: General: Replace NULL and '0' usages with nullptr where applicable

---
 src/core/arm/disassembler/arm_disasm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/arm/disassembler/arm_disasm.cpp')

diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp
index 77af10b54..76408e9fa 100644
--- a/src/core/arm/disassembler/arm_disasm.cpp
+++ b/src/core/arm/disassembler/arm_disasm.cpp
@@ -206,7 +206,7 @@ static const char *opcode_names[] = {
     "swi",
     "tst",
 
-    NULL
+    nullptr
 };
 
 // Indexed by the shift type (bits 6-5)
@@ -399,7 +399,7 @@ std::string ARM_Disasm::Disassemble(u32 addr, u32 insn)
         default:
             return "Error";
     }
-    return NULL;
+    return nullptr;
 }
 
 std::string ARM_Disasm::DisassembleALU(Opcode opcode, u32 insn)
-- 
cgit v1.2.3