From 05590baa071b33eefcf2a215d057ea9d35593c5b Mon Sep 17 00:00:00 2001 From: Stella Stamenova Date: Mon, 8 Jul 2019 21:17:58 +0000 Subject: [PATCH] [lldb] Fix two more issues in Windows following rL365226: Change LaunchThread interface to return an expected A couple of the function signatures changed and they were not updated in the Windows HostProcess llvm-svn: 365388 --- lldb/include/lldb/Host/windows/HostProcessWindows.h | 5 +++-- lldb/source/Host/windows/HostProcessWindows.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lldb/include/lldb/Host/windows/HostProcessWindows.h b/lldb/include/lldb/Host/windows/HostProcessWindows.h index 4178956..925d565 100644 --- a/lldb/include/lldb/Host/windows/HostProcessWindows.h +++ b/lldb/include/lldb/Host/windows/HostProcessWindows.h @@ -30,8 +30,9 @@ public: lldb::pid_t GetProcessId() const override; bool IsRunning() const override; - HostThread StartMonitoring(const Host::MonitorChildProcessCallback &callback, - bool monitor_signals) override; + virtual llvm::Expected + StartMonitoring(const Host::MonitorChildProcessCallback &callback, + bool monitor_signals) override; private: static lldb::thread_result_t MonitorThread(void *thread_arg); diff --git a/lldb/source/Host/windows/HostProcessWindows.cpp b/lldb/source/Host/windows/HostProcessWindows.cpp index c422a86..d7484f8 100644 --- a/lldb/source/Host/windows/HostProcessWindows.cpp +++ b/lldb/source/Host/windows/HostProcessWindows.cpp @@ -94,7 +94,7 @@ llvm::Expected HostProcessWindows::StartMonitoring( &info->process_handle, 0, FALSE, DUPLICATE_SAME_ACCESS)) result = ThreadLauncher::LaunchThread("ChildProcessMonitor", HostProcessWindows::MonitorThread, - info, nullptr); + info); return result; } -- 2.7.4