vendor/lldb/lldb-trunk-r303197

2 files changed, 6 insertions, 7 deletions

diff --git a/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp b/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
index d1eb3a7e9c9e..56a7e74269aa 100644
--- a/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
+++ b/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp
@@ -318,7 +318,7 @@ TEST_F(GDBRemoteCommunicationClientTest, SendSignalsToIgnore) {
 
   const lldb::tid_t tid = 0x47;
   const uint32_t reg_num = 4;
-  std::future<Error> result = std::async(std::launch::async, [&] {
+  std::future<Status> result = std::async(std::launch::async, [&] {
     return client.SendSignalsToIgnore({2, 3, 5, 7, 0xB, 0xD, 0x11});
   });
 
@@ -342,7 +342,7 @@ TEST_F(GDBRemoteCommunicationClientTest, GetMemoryRegionInfo) {
 
   const lldb::addr_t addr = 0xa000;
   MemoryRegionInfo region_info;
-  std::future<Error> result = std::async(std::launch::async, [&] {
+  std::future<Status> result = std::async(std::launch::async, [&] {
     return client.GetMemoryRegionInfo(addr, region_info);
   });
 
@@ -363,7 +363,7 @@ TEST_F(GDBRemoteCommunicationClientTest, GetMemoryRegionInfoInvalidResponse) {
 
   const lldb::addr_t addr = 0x4000;
   MemoryRegionInfo region_info;
-  std::future<Error> result = std::async(std::launch::async, [&] {
+  std::future<Status> result = std::async(std::launch::async, [&] {
     return client.GetMemoryRegionInfo(addr, region_info);
   });
 
diff --git a/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp b/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
index 6440e814efd4..4a86b91c0489 100644
--- a/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
+++ b/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
@@ -32,16 +32,15 @@ void GDBRemoteTest::TearDownTestCase() {
 
 void Connect(GDBRemoteCommunication &client, GDBRemoteCommunication &server) {
   bool child_processes_inherit = false;
-  Error error;
+  Status error;
   TCPSocket listen_socket(true, child_processes_inherit);
   ASSERT_FALSE(error.Fail());
   error = listen_socket.Listen("127.0.0.1:0", 5);
   ASSERT_FALSE(error.Fail());
 
   Socket *accept_socket;
-  std::future<Error> accept_error = std::async(std::launch::async, [&] {
-    return listen_socket.Accept(accept_socket);
-  });
+  std::future<Status> accept_error = std::async(
+      std::launch::async, [&] { return listen_socket.Accept(accept_socket); });
 
   char connect_remote_address[64];
   snprintf(connect_remote_address, sizeof(connect_remote_address),