You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/07/25 16:15:02 UTC

[2/2] lucy-clownfish git commit: Fix 64 to 32-bit conversion warnings

Fix 64 to 32-bit conversion warnings


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

Branch: refs/heads/master
Commit: c6ca5ee657f6feb9d0d6b7a770c6865eff05e52e
Parents: efb1938
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jul 25 16:14:02 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jul 25 16:14:02 2015 +0200

----------------------------------------------------------------------
 runtime/core/Clownfish/Test/TestString.c       | 11 +++++------
 runtime/core/Clownfish/TestHarness/TestUtils.c |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/c6ca5ee6/runtime/core/Clownfish/Test/TestString.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Test/TestString.c b/runtime/core/Clownfish/Test/TestString.c
index eff029b..125b576 100644
--- a/runtime/core/Clownfish/Test/TestString.c
+++ b/runtime/core/Clownfish/Test/TestString.c
@@ -323,18 +323,17 @@ test_To_I64(TestBatchRunner *runner) {
     DECREF(string);
 
     string = S_get_str("10.");
-    TEST_INT_EQ(runner, Str_To_I64(string), 10,
-                "To_I64 stops at non-digits");
+    TEST_TRUE(runner, Str_To_I64(string) == 10, "To_I64 stops at non-digits");
     DECREF(string);
 
     string = S_get_str("10A");
-    TEST_INT_EQ(runner, Str_To_I64(string), 10,
-                "To_I64 stops at out-of-range digits");
+    TEST_TRUE(runner, Str_To_I64(string) == 10,
+              "To_I64 stops at out-of-range digits");
     DECREF(string);
 
     string = S_get_str("-JJ");
-    TEST_INT_EQ(runner, Str_BaseX_To_I64(string, 20), -399,
-                "BaseX_To_I64 base 20");
+    TEST_TRUE(runner, Str_BaseX_To_I64(string, 20) == -399,
+              "BaseX_To_I64 base 20");
     DECREF(string);
 }
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/c6ca5ee6/runtime/core/Clownfish/TestHarness/TestUtils.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/TestHarness/TestUtils.c b/runtime/core/Clownfish/TestHarness/TestUtils.c
index a7f0d0c..b71461d 100644
--- a/runtime/core/Clownfish/TestHarness/TestUtils.c
+++ b/runtime/core/Clownfish/TestHarness/TestUtils.c
@@ -162,7 +162,7 @@ TestUtils_time() {
 
 void
 TestUtils_usleep(uint64_t microseconds) {
-    Sleep(microseconds / 1000);
+    Sleep((DWORD)(microseconds / 1000));
 }
 
 /********************************* UNIXEN *********************************/