From 3faa143f21bfa9faf55a0903146d5d7460e3ce1c Mon Sep 17 00:00:00 2001 From: jsalling Date: Tue, 23 Feb 2016 14:46:52 -0600 Subject: [PATCH] Fix additional primitive type conversion warnings on Linux Using gcc 4.8 on Ubuntu 14 --- extras/fixture/src/unity_fixture.c | 2 +- extras/fixture/test/unity_output_Spy.c | 2 +- src/unity.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index 90314af..d343a9e 100644 --- a/extras/fixture/src/unity_fixture.c +++ b/extras/fixture/src/unity_fixture.c @@ -158,7 +158,7 @@ void UnityMalloc_MakeMallocFailAfterCount(int countdown) #ifdef UNITY_EXCLUDE_STDLIB_MALLOC static unsigned char unity_heap[UNITY_INTERNAL_HEAP_SIZE_BYTES]; -static unsigned int heap_index; +static size_t heap_index; #else #include #endif diff --git a/extras/fixture/test/unity_output_Spy.c b/extras/fixture/test/unity_output_Spy.c index 97c9523..86d5a1c 100644 --- a/extras/fixture/test/unity_output_Spy.c +++ b/extras/fixture/test/unity_output_Spy.c @@ -24,7 +24,7 @@ void UnityOutputCharSpy_Create(int s) spy_enable = 0; buffer = malloc((size_t)size); TEST_ASSERT_NOT_NULL_MESSAGE(buffer, "Internal malloc failed in Spy Create():" __FILE__); - memset(buffer, 0, size); + memset(buffer, 0, (size_t)size); } void UnityOutputCharSpy_Destroy(void) diff --git a/src/unity.c b/src/unity.c index c0593ce..23eaefe 100644 --- a/src/unity.c +++ b/src/unity.c @@ -733,7 +733,7 @@ void UnityAssertFloatSpecial(const _UF actual, const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet }; _U_SINT should_be_trait = ((_U_SINT)style & 1); _U_SINT is_trait = !should_be_trait; - _U_SINT trait_index = style >> 1; + _U_SINT trait_index = (_U_SINT)(style >> 1); UNITY_SKIP_EXECUTION; -- GitLab