From 082a0c2205c6e30da40b8be6bcb2236298fa8e5b Mon Sep 17 00:00:00 2001 From: Vittorio Romeo Date: Sun, 11 Apr 2021 00:59:05 +0100 Subject: [PATCH] Fix '-Wpedantic' warnings under gcc 10.x --- desktop_version/src/Game.h | 4 ++-- desktop_version/src/Graphics.cpp | 14 +++++++------- desktop_version/src/editor.cpp | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index e84bfffb..ce6d3af2 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -79,9 +79,9 @@ namespace Menu timetrialcomplete, timetrialcomplete2, timetrialcomplete3, - gamecompletecontinue, + gamecompletecontinue }; -}; +} struct MenuStackFrame { diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index aa44a66a..33c1221c 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -398,21 +398,21 @@ int Graphics::bfontlen(uint32_t ch) void Graphics::MakeTileArray(void) { - PROCESS_TILESHEET(tiles, 8, ) - PROCESS_TILESHEET(tiles2, 8, ) - PROCESS_TILESHEET(tiles3, 8, ) - PROCESS_TILESHEET(entcolours, 8, ) + PROCESS_TILESHEET(tiles, 8, {}) + PROCESS_TILESHEET(tiles2, 8, {}) + PROCESS_TILESHEET(tiles3, 8, {}) + PROCESS_TILESHEET(entcolours, 8, {}) } void Graphics::maketelearray(void) { - PROCESS_TILESHEET_RENAME(teleporter, tele, 96, ) + PROCESS_TILESHEET_RENAME(teleporter, tele, 96, {}) } void Graphics::MakeSpriteArray(void) { - PROCESS_TILESHEET(sprites, 32, ) - PROCESS_TILESHEET(flipsprites, 32, ) + PROCESS_TILESHEET(sprites, 32, {}) + PROCESS_TILESHEET(flipsprites, 32, {}) } #undef PROCESS_TILESHEET diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp index 203536c7..d3eca1f0 100644 --- a/desktop_version/src/editor.cpp +++ b/desktop_version/src/editor.cpp @@ -195,14 +195,14 @@ static std::string NAME(const std::string& buf) \ return find_tag(buf, "<" TAG ">", ""); \ } -TAG_FINDER(find_metadata, "MetaData"); //only for checking that it exists +TAG_FINDER(find_metadata, "MetaData") //only for checking that it exists -TAG_FINDER(find_creator, "Creator"); -TAG_FINDER(find_title, "Title"); -TAG_FINDER(find_desc1, "Desc1"); -TAG_FINDER(find_desc2, "Desc2"); -TAG_FINDER(find_desc3, "Desc3"); -TAG_FINDER(find_website, "website"); +TAG_FINDER(find_creator, "Creator") +TAG_FINDER(find_title, "Title") +TAG_FINDER(find_desc1, "Desc1") +TAG_FINDER(find_desc2, "Desc2") +TAG_FINDER(find_desc3, "Desc3") +TAG_FINDER(find_website, "website") #undef TAG_FINDER