summaryrefslogtreecommitdiff
path: root/disassembler/disassembler.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2015-04-22 19:59:01 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-04-22 19:59:02 +0000
commit0ad14266a71c8579cd6bebcaf42f56fae37c988f (patch)
treed04d27d21b3c7733d784e303f01f873bb99e7770 /disassembler/disassembler.cc
parent1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff)
parent2cebb24bfc3247d3e9be138a3350106737455918 (diff)
Merge "Replace NULL with nullptr"
Diffstat (limited to 'disassembler/disassembler.cc')
-rw-r--r--disassembler/disassembler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/disassembler/disassembler.cc b/disassembler/disassembler.cc
index c05c3ed8ec..6334717fe5 100644
--- a/disassembler/disassembler.cc
+++ b/disassembler/disassembler.cc
@@ -42,7 +42,7 @@ Disassembler* Disassembler::Create(InstructionSet instruction_set, DisassemblerO
return new x86::DisassemblerX86(options, true);
} else {
UNIMPLEMENTED(FATAL) << "no disassembler for " << instruction_set;
- return NULL;
+ return nullptr;
}
}