- 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:
Mark VanderVoord
2015-12-08 21:31:33 -05:00
parent bb712ef168
commit 0807e45753
4 changed files with 12 additions and 8 deletions
+3
View File
@@ -12,6 +12,8 @@ compiler:
- '-Werror' - '-Werror'
- '-Wcast-qual' - '-Wcast-qual'
- '-Wconversion' - '-Wconversion'
- '-Wtautological-compare'
#- '-Wtautological-pointer-compare'
- '-Wdisabled-optimization' - '-Wdisabled-optimization'
- '-Wformat=2' - '-Wformat=2'
- '-Winit-self' - '-Winit-self'
@@ -36,6 +38,7 @@ compiler:
- '-Wwrite-strings' - '-Wwrite-strings'
- '-Wbad-function-cast' - '-Wbad-function-cast'
- '-Wno-missing-prototypes' #we've been lazy about things like setUp and tearDown - '-Wno-missing-prototypes' #we've been lazy about things like setUp and tearDown
- '-Wno-invalid-token-paste'
- '-fms-extensions' - '-fms-extensions'
- '-fno-omit-frame-pointer' - '-fno-omit-frame-pointer'
- '-ffloat-store' - '-ffloat-store'
@@ -58,7 +58,8 @@
} }
void function_f(void) { void function_f(void) {
voidpointerfunc("hello"); char arg[6] = "hello";
voidpointerfunc(arg);
} }
:tests: :tests:
@@ -391,7 +392,7 @@
:code: | :code: |
test() test()
{ {
char* expect_list = "hello"; char expect_list[6] = "hello";
voidpointerfunc_ExpectWithArray(expect_list, 5); voidpointerfunc_ExpectWithArray(expect_list, 5);
function_f(); function_f();
@@ -402,7 +403,7 @@
:code: | :code: |
test() test()
{ {
char* expect_list = "help!"; char expect_list[6] = "help!";
voidpointerfunc_ExpectWithArray(expect_list, 3); voidpointerfunc_ExpectWithArray(expect_list, 3);
function_f(); function_f();
@@ -413,7 +414,7 @@
:code: | :code: |
test() test()
{ {
char* expect_list = "help!"; char expect_list[6] = "help!";
voidpointerfunc_ExpectWithArray(expect_list, 4); voidpointerfunc_ExpectWithArray(expect_list, 4);
function_f(); function_f();
@@ -424,7 +425,7 @@
:code: | :code: |
test() test()
{ {
char* expect_list = "h"; char expect_list[2] = "h";
voidpointerfunc_Expect(expect_list); voidpointerfunc_Expect(expect_list);
function_f(); function_f();
@@ -435,7 +436,7 @@
:code: | :code: |
test() test()
{ {
char* expect_list = "g"; char expect_list[2] = "g";
voidpointerfunc_Expect(expect_list); voidpointerfunc_Expect(expect_list);
function_f(); function_f();
@@ -231,7 +231,7 @@
:code: | :code: |
test() test()
{ {
char* blah = "blah"; char blah[5] = "blah";
void_type_craziness3_Expect(blah); void_type_craziness3_Expect(blah);
exercise_type_craziness3(blah); exercise_type_craziness3(blah);
} }
+1 -1