Repository: lucy-clownfish
Updated Branches:
  refs/heads/master 00acd7c12 -> 116a44fe1


Fix TestUtils_time with 32-bit time_t

tv_sec must be converted to uint64_t before the multiplication.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/116a44fe
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/116a44fe
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/116a44fe

Branch: refs/heads/master
Commit: 116a44fe19411862285a0b0d20be3970b3ed7113
Parents: 00acd7c
Author: Nick Wellnhofer <wellnho...@aevum.de>
Authored: Thu Apr 14 14:47:05 2016 +0200
Committer: Nick Wellnhofer <wellnho...@aevum.de>
Committed: Thu Apr 14 14:47:05 2016 +0200

----------------------------------------------------------------------
 runtime/core/Clownfish/TestHarness/TestUtils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/116a44fe/runtime/core/Clownfish/TestHarness/TestUtils.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/TestHarness/TestUtils.c 
b/runtime/core/Clownfish/TestHarness/TestUtils.c
index 556d301..38301d3 100644
--- a/runtime/core/Clownfish/TestHarness/TestUtils.c
+++ b/runtime/core/Clownfish/TestHarness/TestUtils.c
@@ -148,7 +148,7 @@ TestUtils_time() {
     struct timeval t;
     gettimeofday(&t, NULL);
 
-    return (uint64_t)(t.tv_sec * 1000000 + t.tv_usec);
+    return (uint64_t)t.tv_sec * 1000000 + (uint64_t)t.tv_usec;
 }
 
 #else

Reply via email to