From 000b4d52b98ae26e7acb83cd1642dee7dbcc7e38 Mon Sep 17 00:00:00 2001 From: Y_Less Date: Sat, 30 Jun 2018 17:23:12 +0200 Subject: [PATCH] Cast error on mac. Yet again fixing the tests... --- source/compiler/sc2.c | 2 +- source/compiler/tests/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/compiler/sc2.c b/source/compiler/sc2.c index ffa5e25..ef9151e 100644 --- a/source/compiler/sc2.c +++ b/source/compiler/sc2.c @@ -520,7 +520,7 @@ static void stripcomment(unsigned char *line) if (icomment==2) *line++=' '; } else if (*line=='/' && *(line+1)=='/'){ /* comment to end of line */ - continuation=line; + continuation=(char*)line; while ((continuation=strchr(continuation,'\a'))!=NULL){ /* don't give the error if the next line is also commented out. it is quite annoying to get an error for commenting out a define using: diff --git a/source/compiler/tests/CMakeLists.txt b/source/compiler/tests/CMakeLists.txt index 57538fc..5d22a65 100644 --- a/source/compiler/tests/CMakeLists.txt +++ b/source/compiler/tests/CMakeLists.txt @@ -20,8 +20,8 @@ set_tests_properties(gh_217 PROPERTIES PASS_REGULAR_EXPRESSION ".*\\.pwn\\(11\\) .*\\.pwn\\(13\\) : warning 237: user warning: this is warning 2 .*\\.pwn\\(15\\) : warning 237: user warning: this is warning 3 .*\\.pwn\\(17\\) : warning 237: user warning: this is warning 4 -.*\\.pwn\\(27\\) : warning 234: function is deprecated \\(symbol \"f\"\\) don't use this function please -.*\\.pwn\\(32\\) : warning 234: function is deprecated \\(symbol \"f\"\\) don't use this function please +.*\\.pwn\\(28\\) : warning 234: function is deprecated \\(symbol \"f\"\\) don't use this function please +.*\\.pwn\\(33\\) : warning 234: function is deprecated \\(symbol \"f\"\\) don't use this function please ") add_compiler_test(reset_errline_gh_230 ${CMAKE_CURRENT_SOURCE_DIR}/reset_errline_gh_230.pwn)