From 0b3ffb54b7c6935e4e178534a4acb112aaa99a06 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 7 Jul 2012 16:28:39 +0100 Subject: [PATCH] Fix signedness warning in time_to_msec() We have a signed integer here so let the return type take in account that. Found by Clang with -Weverything option. No functional change. Signed-off-by: Marco Costalba --- src/misc.h | 2 +- src/platform.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc.h b/src/misc.h index 29d35d5b..0cd5a706 100644 --- a/src/misc.h +++ b/src/misc.h @@ -51,7 +51,7 @@ struct Log : public std::ofstream { struct Time { void restart() { system_time(&t); } - uint64_t msec() const { return time_to_msec(t); } + int64_t msec() const { return time_to_msec(t); } int elapsed() const { return int(current_time().msec() - time_to_msec(t)); } static Time current_time() { Time t; t.restart(); return t; } diff --git a/src/platform.h b/src/platform.h index e002d218..ffa00a57 100644 --- a/src/platform.h +++ b/src/platform.h @@ -48,7 +48,7 @@ typedef unsigned __int64 uint64_t; typedef timeval sys_time_t; inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); } -inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; } +inline int64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; } # include typedef pthread_mutex_t Lock; @@ -74,7 +74,7 @@ typedef void*(*pt_start_fn)(void*); typedef _timeb sys_time_t; inline void system_time(sys_time_t* t) { _ftime(t); } -inline uint64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; } +inline int64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; } #if !defined(NOMINMAX) # define NOMINMAX // disable macros min() and max() -- 2.39.2