aboutsummaryrefslogtreecommitdiff
path: root/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2022-01-01 13:35:54 -0500
committerNico Weber <thakis@chromium.org>2022-01-01 13:35:54 -0500
commit4f2eeb6a657abf82d13e95c7ab0d7d02fab98ed1 (patch)
treeb015c2316fc2c665c1623581386b2c6b93215fa3 /lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
parentdd2ad7fa47f8c0a186521bae42f4dcabf3710670 (diff)
downloadllvm-4f2eeb6a657abf82d13e95c7ab0d7d02fab98ed1.tar.gz
llvm-4f2eeb6a657abf82d13e95c7ab0d7d02fab98ed1.tar.bz2
llvm-4f2eeb6a657abf82d13e95c7ab0d7d02fab98ed1.zip
Revert "[lldb] Use nullptr instead of 0 or NULL (NFC)"
This reverts commit 24d240558811604354a8d6080405f6bad8d15b5c. Breaks building on Windows: ../../lldb/include\lldb/Host/HostNativeThreadBase.h(49,36): error: cannot initialize a member subobject of type 'lldb::thread_result_t' (aka 'unsigned int') with an rvalue of type 'std::nullptr_t' lldb::thread_result_t m_result = nullptr; ^~~~~~~ 1 error generated.
Diffstat (limited to 'lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp')
-rw-r--r--lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index 30d7d239834b..e72d55dd2aba 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -768,9 +768,9 @@ public:
// Write out the EXC registers
data.PutHex32(EXCRegSet);
data.PutHex32(EXCWordCount);
- PrintRegisterValue(reg_ctx, "far", nullptr, 8, data);
- PrintRegisterValue(reg_ctx, "esr", nullptr, 4, data);
- PrintRegisterValue(reg_ctx, "exception", nullptr, 4, data);
+ PrintRegisterValue(reg_ctx, "far", NULL, 8, data);
+ PrintRegisterValue(reg_ctx, "esr", NULL, 4, data);
+ PrintRegisterValue(reg_ctx, "exception", NULL, 4, data);
return true;
}
return false;
@@ -5073,7 +5073,7 @@ void ObjectFileMachO::GetAllArchSpecs(const llvm::MachO::mach_header &header,
lldb::offset_t offset = lc_offset;
for (uint32_t i = 0; i < header.ncmds; ++i) {
const lldb::offset_t cmd_offset = offset;
- if (data.GetU32(&offset, &load_cmd, 2) == nullptr)
+ if (data.GetU32(&offset, &load_cmd, 2) == NULL)
break;
llvm::MachO::version_min_command version_min;
@@ -5123,7 +5123,7 @@ void ObjectFileMachO::GetAllArchSpecs(const llvm::MachO::mach_header &header,
offset = lc_offset;
for (uint32_t i = 0; i < header.ncmds; ++i) {
const lldb::offset_t cmd_offset = offset;
- if (data.GetU32(&offset, &load_cmd, 2) == nullptr)
+ if (data.GetU32(&offset, &load_cmd, 2) == NULL)
break;
do {