diff options
| author |   Matteo Bernardini | 2019-02-17 19:00:23 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2019-02-17 19:00:23 +0100 |
| commit | 728d1f98285ca36c6f63c48b4a9f3125ef7396ff (patch) | |
| tree | b9f9d2618fd06436d8eb61488edebac987197d5e /games/glob2/c++14.patch | |
| parent | 77c0f4770537aea300fccd3189b723bfada95f22 (diff) | |
| download | slackbuilds-d3a54bdd6cf5c967bb7a0a5a72dbf487bad56b2a.tar.gz | |
20190217.1 global branch merge.current-20190217.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/glob2/c++14.patch')
| -rw-r--r-- | games/glob2/c++14.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/games/glob2/c++14.patch b/games/glob2/c++14.patch new file mode 100644 index 0000000000..6465f659af --- /dev/null +++ b/games/glob2/c++14.patch @@ -0,0 +1,46 @@ +# HG changeset patch +# User Jonathan Wakely <jwakely@redhat.com> +# Date 1485875296 0 +# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a +# Parent c4da01699846179d8bf21e8dae2b973158ec0775 +Fix last argument to ChooseMapScreen constructor + +Since C++14 'false' is not a valid null pointer constant, so cannot be passed +to functions expecting pointer arguments. + +diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp +--- a/src/EditorMainMenu.cpp ++++ b/src/EditorMainMenu.cpp +@@ -90,7 +90,7 @@ + } + else if (par1==LOADMAP) + { +- ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false); ++ ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL); + int rc=chooseMapScreen.execute(globalContainer->gfx, 40); + if (rc==ChooseMapScreen::OK) + { +diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp +--- a/src/LANMenuScreen.cpp ++++ b/src/LANMenuScreen.cpp +@@ -62,7 +62,7 @@ + } + else if(par1 == HOST) + { +- ChooseMapScreen cms("maps", "map", false, "games", "game", false); ++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); + int rc = cms.execute(globalContainer->gfx, 40); + if(rc == ChooseMapScreen::OK) + { +diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp +--- a/src/YOGClientLobbyScreen.cpp ++++ b/src/YOGClientLobbyScreen.cpp +@@ -326,7 +326,7 @@ + + void YOGClientLobbyScreen::hostGame() + { +- ChooseMapScreen cms("maps", "map", false, "games", "game", false); ++ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); + int rc = cms.execute(globalContainer->gfx, 40); + if(rc == ChooseMapScreen::OK) + { |