[Lldb-commits] [lldb] r346873 - Fix some compilation failures introduced in recent patches.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Wed Nov 14 09:22:09 2018
New Revision: 346873

URL: http://llvm.org/viewvc/llvm-project?rev=346873&view=rev
Log:
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.

Modified:
    lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp

Modified: lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp?rev=346873&r1=346872&r2=346873&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp (original)
+++ lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp Wed Nov 14 09:22:09 2018
@@ -783,7 +783,8 @@ static uint64_t decodeTaggedTimeInterval
   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.

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp?rev=346873&r1=346872&r2=346873&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp Wed Nov 14 09:22:09 2018
@@ -190,15 +190,15 @@ thread_result_t GDBRemoteCommunicationRe
         case eBroadcastBitAsyncContinue:
           ReceivePacket(*server, done);
           if (done)
-            return nullptr;
+            return {};
           break;
         case eBroadcastBitAsyncThreadShouldExit:
         default:
-          return nullptr;
+          return {};
         }
       }
     }
   }
 
-  return nullptr;
+  return {};
 }