diff options
author | Zachary Turner <zturner@google.com> | 2018-11-14 17:22:09 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2018-11-14 17:22:09 +0000 |
commit | fca18e94e116581a71017230ab631955cb115af3 (patch) | |
tree | 509d93ee9d4eb364ae0f557418e3ee80bc437a9e /lldb | |
parent | c9b1b100e41fc6e6c0eb6fe1bb8a30c6707de68c (diff) | |
download | bcm5719-llvm-fca18e94e116581a71017230ab631955cb115af3.tar.gz bcm5719-llvm-fca18e94e116581a71017230ab631955cb115af3.zip |
Fix some compilation failures introduced in recent patches.
This fixes two compilation failures:
1) Designated initializers are C++20. We can't use them in LLVM.
2) thread_result_t is not a pointer type on all platforms, so
returning nullptr is an error.
llvm-svn: 346873
Diffstat (limited to 'lldb')
-rw-r--r-- | lldb/source/Plugins/Language/ObjC/Cocoa.cpp | 3 | ||||
-rw-r--r-- | lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp index 16f77e898c5..4aa3e0b2d15 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp @@ -783,7 +783,8 @@ static uint64_t decodeTaggedTimeInterval(uint64_t encodedTimeInterval) { if (encodedTimeInterval == std::numeric_limits<uint64_t>::max()) return (uint64_t)-0.0; - TaggedDoubleBits encodedBits = { .i = encodedTimeInterval }; + TaggedDoubleBits encodedBits = {}; + encodedBits.i = encodedTimeInterval; DoubleBits decodedBits; // Sign and fraction are represented exactly. diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp index c272f93b37e..a0ebf42d810 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp @@ -190,15 +190,15 @@ thread_result_t GDBRemoteCommunicationReplayServer::AsyncThread(void *arg) { case eBroadcastBitAsyncContinue: ReceivePacket(*server, done); if (done) - return nullptr; + return {}; break; case eBroadcastBitAsyncThreadShouldExit: default: - return nullptr; + return {}; } } } } - return nullptr; + return {}; } |