From 78850b01b90c5aaacc49f523270fbbdcd7e600a7 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 14 Feb 2012 11:39:20 +0100 Subject: [PATCH] platform: let CTimeout return uint32_t instead of uint64_t. fixes compilation warning --- src/lib/platform/threads/mutex.h | 2 +- src/lib/platform/util/timeutils.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/platform/threads/mutex.h b/src/lib/platform/threads/mutex.h index 11e3606..4a0c331 100644 --- a/src/lib/platform/threads/mutex.h +++ b/src/lib/platform/threads/mutex.h @@ -261,7 +261,7 @@ namespace PLATFORM if (!predicate) { CTimeout timeout(iTimeout); - uint64_t iMsLeft(0); + uint32_t iMsLeft(0); bReturn = false; while (!bReturn) { diff --git a/src/lib/platform/util/timeutils.h b/src/lib/platform/util/timeutils.h index 985712a..3b1ef70 100644 --- a/src/lib/platform/util/timeutils.h +++ b/src/lib/platform/util/timeutils.h @@ -113,10 +113,10 @@ namespace PLATFORM bool IsSet(void) const { return m_iTarget > 0; } void Init(uint32_t iTimeout) { m_iTarget = GetTimeMs() + iTimeout; } - uint64_t TimeLeft(void) const + uint32_t TimeLeft(void) const { uint64_t iNow = GetTimeMs(); - return (iNow > m_iTarget) ? 0 : m_iTarget - iNow; + return (iNow > m_iTarget) ? 0 : (uint32_t)(m_iTarget - iNow); } private: -- 2.34.1