espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-25 10:13:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix additional primitive type conversion warnings on Linux

Browse Source 
Using gcc 4.8 on Ubuntu 14
This commit is contained in:
jsalling
2016-02-23 14:46:52 -06:00
parent 7fff3fc034
commit 3faa143f21
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/fixture/src/unity_fixture.c
View File

@ -158,7 +158,7 @@ void UnityMalloc_MakeMallocFailAfterCount(int countdown)
#ifdef UNITY_EXCLUDE_STDLIB_MALLOC #ifdef UNITY_EXCLUDE_STDLIB_MALLOC
static unsigned char unity_heap[UNITY_INTERNAL_HEAP_SIZE_BYTES]; static unsigned char unity_heap[UNITY_INTERNAL_HEAP_SIZE_BYTES];
static unsigned int heap_index; static size_t heap_index;
#else #else
#include <stdlib.h> #include <stdlib.h>
#endif #endif

2
extras/fixture/test/unity_output_Spy.c
View File

@ -24,7 +24,7 @@ void UnityOutputCharSpy_Create(int s)
spy_enable = 0; spy_enable = 0;
buffer = malloc((size_t)size); buffer = malloc((size_t)size);
TEST_ASSERT_NOT_NULL_MESSAGE(buffer, "Internal malloc failed in Spy Create():" __FILE__); 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) void UnityOutputCharSpy_Destroy(void)

2
src/unity.c
View File

@ -733,7 +733,7 @@ void UnityAssertFloatSpecial(const _UF actual,
const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet }; const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet };
_U_SINT should_be_trait = ((_U_SINT)style & 1); _U_SINT should_be_trait = ((_U_SINT)style & 1);
_U_SINT is_trait = !should_be_trait; _U_SINT is_trait = !should_be_trait;
_U_SINT trait_index = style >> 1; _U_SINT trait_index = (_U_SINT)(style >> 1);
UNITY_SKIP_EXECUTION; UNITY_SKIP_EXECUTION;