maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Pavel Labath 2016-11-25 12:15:17 +00:00
parent c4063eee0d
commit 3043fd8ff0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/Core/Communication.cpp
View File

@ -115,6 +115,8 @@ bool Communication::HasConnection() const {
size_t Communication::Read(void *dst, size_t dst_len, size_t Communication::Read(void *dst, size_t dst_len,
const Timeout<std::micro> &timeout, const Timeout<std::micro> &timeout,
ConnectionStatus &status, Error *error_ptr) { ConnectionStatus &status, Error *error_ptr) {
using std::chrono::microseconds;
lldb_private::LogIfAnyCategoriesSet( lldb_private::LogIfAnyCategoriesSet(
LIBLLDB_LOG_COMMUNICATION, LIBLLDB_LOG_COMMUNICATION,
"%p Communication::Read (dst = %p, dst_len = %" PRIu64 "%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( listener_sp->StartListeningForEvents(
this, eBroadcastBitReadThreadGotBytes | eBroadcastBitReadThreadDidExit); this, eBroadcastBitReadThreadGotBytes | eBroadcastBitReadThreadDidExit);
EventSP event_sp; EventSP event_sp;
std::chrono::microseconds listener_timeout = microseconds listener_timeout =
timeout ? *timeout : std::chrono::microseconds(0); timeout ? microseconds(*timeout) : microseconds(0);
while (listener_sp->WaitForEvent(listener_timeout, event_sp)) { while (listener_sp->WaitForEvent(listener_timeout, event_sp)) {
const uint32_t event_type = event_sp->GetType(); const uint32_t event_type = event_sp->GetType();
if (event_type & eBroadcastBitReadThreadGotBytes) { if (event_type & eBroadcastBitReadThreadGotBytes) {