summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2016-11-25 12:15:17 +0000
committerPavel Labath <labath@google.com>2016-11-25 12:15:17 +0000
commit3043fd8ff087b1b577e363f33bbc1b6e1e8d5cdc (patch)
treea1a54fb3907c4a101a17f23e7cebcf6743da51e8
parentc4063eee0d9ad122bb346a6c9a8e9546e24c1291 (diff)
downloadbcm5719-llvm-3043fd8ff087b1b577e363f33bbc1b6e1e8d5cdc.tar.gz
bcm5719-llvm-3043fd8ff087b1b577e363f33bbc1b6e1e8d5cdc.zip
Fix FreeBSD build error in r287920
The conditional expression is ambiguous there, so help it by explicitly casting. This will go away once we use chrono all the way down. llvm-svn: 287921
-rw-r--r--lldb/source/Core/Communication.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp
index 47616ccf2e7..c82e2fe9368 100644
--- a/lldb/source/Core/Communication.cpp
+++ b/lldb/source/Core/Communication.cpp
@@ -115,6 +115,8 @@ bool Communication::HasConnection() const {
size_t Communication::Read(void *dst, size_t dst_len,
const Timeout<std::micro> &timeout,
ConnectionStatus &status, Error *error_ptr) {
+ using std::chrono::microseconds;
+
lldb_private::LogIfAnyCategoriesSet(
LIBLLDB_LOG_COMMUNICATION,
"%p Communication::Read (dst = %p, dst_len = %" PRIu64
@@ -141,8 +143,8 @@ size_t Communication::Read(void *dst, size_t dst_len,
listener_sp->StartListeningForEvents(
this, eBroadcastBitReadThreadGotBytes | eBroadcastBitReadThreadDidExit);
EventSP event_sp;
- std::chrono::microseconds listener_timeout =
- timeout ? *timeout : std::chrono::microseconds(0);
+ microseconds listener_timeout =
+ timeout ? microseconds(*timeout) : microseconds(0);
while (listener_sp->WaitForEvent(listener_timeout, event_sp)) {
const uint32_t event_type = event_sp->GetType();
if (event_type & eBroadcastBitReadThreadGotBytes) {
OpenPOWER on IntegriCloud