diff options
| author |  Lioncash | 2015-09-11 14:50:10 -0400 |
|---|---|---|
| committer | Lioncash | 2015-09-11 14:59:49 -0400 |
| commit | 60b3fc01a2377e51d5d8acb497c75f41daf14030 (patch) | |
| tree | e6f64223500d6f579a924b1c53b6a20813abf1ee /src/core/arm/disassembler | |
| parent | Merge pull request #1141 from lioncash/hdr (diff) | |
| download | yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.gz yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.tar.xz yuzu-60b3fc01a2377e51d5d8acb497c75f41daf14030.zip | |
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[] = { | |||
| 206 | "swi", | 206 | "swi", |
| 207 | "tst", | 207 | "tst", |
| 208 | 208 | ||
| 209 | NULL | 209 | nullptr |
| 210 | }; | 210 | }; |
| 211 | 211 | ||
| 212 | // Indexed by the shift type (bits 6-5) | 212 | // Indexed by the shift type (bits 6-5) |
| @@ -399,7 +399,7 @@ std::string ARM_Disasm::Disassemble(u32 addr, u32 insn) | |||
| 399 | default: | 399 | default: |
| 400 | return "Error"; | 400 | return "Error"; |
| 401 | } | 401 | } |
| 402 | return NULL; | 402 | return nullptr; |
| 403 | } | 403 | } |
| 404 | 404 | ||
| 405 | std::string ARM_Disasm::DisassembleALU(Opcode opcode, u32 insn) | 405 | std::string ARM_Disasm::DisassembleALU(Opcode opcode, u32 insn) |