Merge pull request #272 from FSMaxB/gcc43-wconversion

Fix -Wconversion with gcc-4.3

Merge pull request #272 from FSMaxB/gcc43-wconversion
Fix -Wconversion with gcc-4.3
7b80885c · Mark VanderVoord · GitHub · 0781e74a · 1c556d2e · 7b80885c
显示空白变更内容
内联并排

Showing with 4 addition and 4 deletion

src/unity.c src/unity.c +4 -4

未找到文件。
--- a/src/unity.c
+++ b/src/unity.c
@@ -898,16 +898,16 @@ void UnityAssertNumbersWithin(const UNITY_UINT delta,
    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
    {
        if (actual > expected)
-            Unity.CurrentTestFailed = ((UNITY_UINT)(actual - expected) > delta);
+          Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
        else
-            Unity.CurrentTestFailed = ((UNITY_UINT)(expected - actual) > delta);
+            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
    }
    else
    {
        if ((UNITY_UINT)actual > (UNITY_UINT)expected)
-            Unity.CurrentTestFailed = ((UNITY_UINT)(actual - expected) > delta);
+            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
        else
-            Unity.CurrentTestFailed = ((UNITY_UINT)(expected - actual) > delta);
+            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
    }

    if (Unity.CurrentTestFailed)