Merge pull request #1147 from lioncash/nullptr

General: Replace NULL and '0' usages with nullptr where applicable

1 files changed, 2 insertions, 2 deletions

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)