diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-11 18:56:41 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-11 18:56:41 -0300 |
| commit | 5bca1e6adf759f6b918b3b061610cba8adef0981 (patch) | |
| tree | e98f1c4a8779edbb8f0f22a1757ec2283669dc4b /src/core/arm/disassembler | |
| parent | 5bf8eed96c85ea9cdaa2d262faf85851e51b3d77 (diff) | |
| parent | 60b3fc01a2377e51d5d8acb497c75f41daf14030 (diff) | |
Merge pull request #1147 from lioncash/nullptr
General: Replace NULL and '0' usages with nullptr where applicable
Diffstat (limited to 'src/core/arm/disassembler')
| -rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 4 |
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) |