mirror of
https://github.com/ThrowTheSwitch/CMock.git
synced 2026-06-05 21:15:20 +00:00
- Merge in latest Unity
- Avoid getting casting errors of going from const char* to void* by going from char[] instead
This commit is contained in:
@@ -12,6 +12,8 @@ compiler:
|
||||
- '-Werror'
|
||||
- '-Wcast-qual'
|
||||
- '-Wconversion'
|
||||
- '-Wtautological-compare'
|
||||
#- '-Wtautological-pointer-compare'
|
||||
- '-Wdisabled-optimization'
|
||||
- '-Wformat=2'
|
||||
- '-Winit-self'
|
||||
@@ -36,6 +38,7 @@ compiler:
|
||||
- '-Wwrite-strings'
|
||||
- '-Wbad-function-cast'
|
||||
- '-Wno-missing-prototypes' #we've been lazy about things like setUp and tearDown
|
||||
- '-Wno-invalid-token-paste'
|
||||
- '-fms-extensions'
|
||||
- '-fno-omit-frame-pointer'
|
||||
- '-ffloat-store'
|
||||
|
||||
@@ -58,7 +58,8 @@
|
||||
}
|
||||
|
||||
void function_f(void) {
|
||||
voidpointerfunc("hello");
|
||||
char arg[6] = "hello";
|
||||
voidpointerfunc(arg);
|
||||
}
|
||||
|
||||
:tests:
|
||||
@@ -391,7 +392,7 @@
|
||||
:code: |
|
||||
test()
|
||||
{
|
||||
char* expect_list = "hello";
|
||||
char expect_list[6] = "hello";
|
||||
voidpointerfunc_ExpectWithArray(expect_list, 5);
|
||||
|
||||
function_f();
|
||||
@@ -402,7 +403,7 @@
|
||||
:code: |
|
||||
test()
|
||||
{
|
||||
char* expect_list = "help!";
|
||||
char expect_list[6] = "help!";
|
||||
voidpointerfunc_ExpectWithArray(expect_list, 3);
|
||||
|
||||
function_f();
|
||||
@@ -413,7 +414,7 @@
|
||||
:code: |
|
||||
test()
|
||||
{
|
||||
char* expect_list = "help!";
|
||||
char expect_list[6] = "help!";
|
||||
voidpointerfunc_ExpectWithArray(expect_list, 4);
|
||||
|
||||
function_f();
|
||||
@@ -424,7 +425,7 @@
|
||||
:code: |
|
||||
test()
|
||||
{
|
||||
char* expect_list = "h";
|
||||
char expect_list[2] = "h";
|
||||
voidpointerfunc_Expect(expect_list);
|
||||
|
||||
function_f();
|
||||
@@ -435,7 +436,7 @@
|
||||
:code: |
|
||||
test()
|
||||
{
|
||||
char* expect_list = "g";
|
||||
char expect_list[2] = "g";
|
||||
voidpointerfunc_Expect(expect_list);
|
||||
|
||||
function_f();
|
||||
|
||||
@@ -231,7 +231,7 @@
|
||||
:code: |
|
||||
test()
|
||||
{
|
||||
char* blah = "blah";
|
||||
char blah[5] = "blah";
|
||||
void_type_craziness3_Expect(blah);
|
||||
exercise_type_craziness3(blah);
|
||||
}
|
||||
|
||||
Vendored
+1
-1
Submodule vendor/unity updated: b922d622a6...9aeaee26c9
Reference in New Issue
Block a user