diff options
Diffstat (limited to 'lldb/source/Core')
| -rw-r--r-- | lldb/source/Core/Communication.cpp | 7 | ||||
| -rw-r--r-- | lldb/source/Core/ConnectionSharedMemory.cpp | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp index c82e2fe9368..113a847953d 100644 --- a/lldb/source/Core/Communication.cpp +++ b/lldb/source/Core/Communication.cpp @@ -278,11 +278,8 @@ size_t Communication::ReadFromConnection(void *dst, size_t dst_len, ConnectionStatus &status, Error *error_ptr) { lldb::ConnectionSP connection_sp(m_connection_sp); - if (connection_sp) { - return connection_sp->Read(dst, dst_len, - timeout ? timeout->count() : UINT32_MAX, status, - error_ptr); - } + if (connection_sp) + return connection_sp->Read(dst, dst_len, timeout, status, error_ptr); if (error_ptr) error_ptr->SetErrorString("Invalid connection."); diff --git a/lldb/source/Core/ConnectionSharedMemory.cpp b/lldb/source/Core/ConnectionSharedMemory.cpp index 05dec4856c2..6cc2eb1b219 100644 --- a/lldb/source/Core/ConnectionSharedMemory.cpp +++ b/lldb/source/Core/ConnectionSharedMemory.cpp @@ -79,7 +79,7 @@ ConnectionStatus ConnectionSharedMemory::Disconnect(Error *error_ptr) { } size_t ConnectionSharedMemory::Read(void *dst, size_t dst_len, - uint32_t timeout_usec, + const Timeout<std::micro> &timeout, ConnectionStatus &status, Error *error_ptr) { status = eConnectionStatusSuccess; |
