diff --git a/examples/example_1/makefile b/examples/example_1/makefile index 3d8d763..c8c4b9e 100644 --- a/examples/example_1/makefile +++ b/examples/example_1/makefile @@ -32,13 +32,10 @@ CFLAGS += -Wwrite-strings CFLAGS += -Wswitch-default CFLAGS += -Wunreachable-code CFLAGS += -Winit-self -CFLAGS += -Wlogical-op CFLAGS += -Wmissing-field-initializers CFLAGS += -Wno-unknown-pragmas -CFLAGS += -Wjump-misses-init CFLAGS += -Wstrict-prototypes CFLAGS += -Wundef -CFLAGS += -Wunsafe-loop-optimizations CFLAGS += -Wold-style-definition TARGET_BASE1=test1 diff --git a/examples/example_2/makefile b/examples/example_2/makefile index 311e8ce..80956b6 100644 --- a/examples/example_2/makefile +++ b/examples/example_2/makefile @@ -32,13 +32,10 @@ CFLAGS += -Wwrite-strings CFLAGS += -Wswitch-default CFLAGS += -Wunreachable-code CFLAGS += -Winit-self -CFLAGS += -Wlogical-op CFLAGS += -Wmissing-field-initializers CFLAGS += -Wno-unknown-pragmas -CFLAGS += -Wjump-misses-init CFLAGS += -Wstrict-prototypes CFLAGS += -Wundef -CFLAGS += -Wunsafe-loop-optimizations CFLAGS += -Wold-style-definition CFLAGS += -Wmissing-prototypes CFLAGS += -Wmissing-declarations diff --git a/examples/example_3/makefile b/examples/example_3/makefile index aa485f3..b2d299f 100644 --- a/examples/example_3/makefile +++ b/examples/example_3/makefile @@ -32,13 +32,10 @@ CFLAGS += -Wwrite-strings CFLAGS += -Wswitch-default CFLAGS += -Wunreachable-code CFLAGS += -Winit-self -CFLAGS += -Wlogical-op CFLAGS += -Wmissing-field-initializers CFLAGS += -Wno-unknown-pragmas -CFLAGS += -Wjump-misses-init CFLAGS += -Wstrict-prototypes CFLAGS += -Wundef -CFLAGS += -Wunsafe-loop-optimizations CFLAGS += -Wold-style-definition TARGET_BASE1=test1 diff --git a/src/unity.c b/src/unity.c index d349f6e..d6fd0a1 100644 --- a/src/unity.c +++ b/src/unity.c @@ -481,15 +481,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, case UNITY_DISPLAY_STYLE_UINT16: while (elements--) { - if (*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -503,15 +503,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, case UNITY_DISPLAY_STYLE_UINT64: while (elements--) { - if (*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -523,15 +523,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, default: while (elements--) { - if (*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } diff --git a/test/targets/gcc_auto_stdint.yml b/test/targets/gcc_auto_stdint.yml index 4e642c1..0405629 100644 --- a/test/targets/gcc_auto_stdint.yml +++ b/test/targets/gcc_auto_stdint.yml @@ -18,13 +18,10 @@ compiler: - '-Wswitch-default' - '-Wunreachable-code' - '-Winit-self' - - '-Wlogical-op' - '-Wmissing-field-initializers' - '-Wno-unknown-pragmas' - - '-Wjump-misses-init' - '-Wstrict-prototypes' - '-Wundef' - - '-Wunsafe-loop-optimizations' - '-Wold-style-definition' includes: prefix: '-I'