Attachment 518942 Details for Bug 641110 – minimally modified patch from upstream for C++11 support

[patch] minimally modified patch from upstream for C++11 support

dunelegacy-0.96.3-c++11.patch (text/plain), 11.78 KB, created by Nico R. on 2018-02-10 10:46:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nico R.

Created: 2018-02-10 10:46:47 UTC

Size: 11.78 KB

patch

obsolete

>From 817c1872702d6258676e3c2b7426596d1ef1ad59-modified Mon Sep 17 00:00:00 2001
>From: Richard Schaller <richard.schaller@gmx.de>
>Date: Wed, 20 Jan 2016 12:24:49 +0100
>Subject: [PATCH] Drop support for compilers not supporting C++11
>
>configure.ac changes removed by Nico R. <n-roeser@gmx.net>, as we drop them for
>Gentoo in an earlier patch.
>
>---
> IDE/codeblocks/dunelegacy.cbp               | 2 --
> configure.ac                                | 2 +-
> include/FileClasses/FontManager.h           | 2 +-
> include/FileClasses/GFXManager.h            | 2 +-
> include/FileClasses/PictureFactory.h        | 2 +-
> include/FileClasses/TextManager.h           | 2 +-
> include/GUI/Button.h                        | 2 +-
> include/GUI/ClickMap.h                      | 2 +-
> include/GUI/DropDownBox.h                   | 2 +-
> include/GUI/ListBox.h                       | 3 +--
> include/GUI/ScrollBar.h                     | 2 +-
> include/GUI/Widget.h                        | 3 +--
> include/GUI/dune/ChatManager.h              | 2 +-
> include/House.h                             | 2 +-
> include/INIMap/INIMap.h                     | 2 +-
> include/INIMap/INIMapLoader.h               | 2 +-
> include/INIMap/INIMapPreviewCreator.h       | 2 +-
> include/MapEditor/MapEditorOperation.h      | 3 +--
> include/Network/LANGameFinderAndAnnouncer.h | 2 +-
> include/Network/MetaServerClient.h          | 4 ++--
> include/Network/NetworkManager.h            | 3 +--
> include/RadarViewBase.h                     | 3 +--
> include/Trigger/TriggerManager.h            | 2 +-
> include/players/PlayerFactory.h             | 2 +-
> src/FileClasses/PictureFactory.cpp          | 3 +--
> src/MapEditor/MapGenerator.cpp              | 2 +-
> src/Menu/CustomGameMenu.cpp                 | 2 +-
> src/Trigger/ReinforcementTrigger.cpp        | 3 ++-
> 28 files changed, 29 insertions(+), 36 deletions(-)
>
>diff --git a/IDE/codeblocks/dunelegacy.cbp b/IDE/codeblocks/dunelegacy.cbp
>index 2791bc1..fdd855a 100644
>--- a/IDE/codeblocks/dunelegacy.cbp
>+++ b/IDE/codeblocks/dunelegacy.cbp
>@@ -239,9 +239,7 @@
> 		<Unit filename="../../include/misc/Scaler.h" />
> 		<Unit filename="../../include/misc/draw_util.h" />
> 		<Unit filename="../../include/misc/fnkdat.h" />
>-		<Unit filename="../../include/misc/functional.h" />
> 		<Unit filename="../../include/misc/md5.h" />
>-		<Unit filename="../../include/misc/memory.h" />
> 		<Unit filename="../../include/misc/sound_util.h" />
> 		<Unit filename="../../include/misc/strictmath.h" />
> 		<Unit filename="../../include/misc/string_util.h" />
>diff --git a/include/FileClasses/FontManager.h b/include/FileClasses/FontManager.h
>index 70467b2..b90fd60 100644
>--- a/include/FileClasses/FontManager.h
>+++ b/include/FileClasses/FontManager.h
>@@ -21,7 +21,7 @@
> #include <SDL.h>
> #include "Font.h"
> 
>-#include <misc/memory.h>
>+#include <memory>
> #include <string>
> 
> typedef enum {
>diff --git a/include/FileClasses/GFXManager.h b/include/FileClasses/GFXManager.h
>index 7b030bc..bb44a25 100644
>--- a/include/FileClasses/GFXManager.h
>+++ b/include/FileClasses/GFXManager.h
>@@ -25,7 +25,7 @@
> #include <DataTypes.h>
> 
> #include <string>
>-#include <misc/memory.h>
>+#include <memory>
> 
> #define NUM_MAPCHOICEPIECES	28
> #define NUM_MAPCHOICEARROWS	9
>diff --git a/include/FileClasses/PictureFactory.h b/include/FileClasses/PictureFactory.h
>index 1fe0933..37bbf55 100644
>--- a/include/FileClasses/PictureFactory.h
>+++ b/include/FileClasses/PictureFactory.h
>@@ -23,7 +23,7 @@
> 
> #include <SDL.h>
> 
>-#include <misc/memory.h>
>+#include <memory>
> 
> class PictureFactory {
> public:
>diff --git a/include/FileClasses/TextManager.h b/include/FileClasses/TextManager.h
>index c7530ff..628a8ce 100644
>--- a/include/FileClasses/TextManager.h
>+++ b/include/FileClasses/TextManager.h
>@@ -24,7 +24,7 @@
> #include <string>
> #include <vector>
> #include <map>
>-#include <misc/memory.h>
>+#include <memory>
> 
> #include <algorithm>
> 
>diff --git a/include/GUI/Button.h b/include/GUI/Button.h
>index ac1bf29..e660d68 100644
>--- a/include/GUI/Button.h
>+++ b/include/GUI/Button.h
>@@ -20,10 +20,10 @@
> 
> #include "Widget.h"
> #include "GUIStyle.h"
>-#include <misc/functional.h>
> #include <SDL.h>
> 
> #include <string>
>+#include <functional>
> 
> /// A abstract base class for all buttons
> class Button : public Widget {
>diff --git a/include/GUI/ClickMap.h b/include/GUI/ClickMap.h
>index 65b19b4..849c18c 100644
>--- a/include/GUI/ClickMap.h
>+++ b/include/GUI/ClickMap.h
>@@ -20,7 +20,7 @@
> 
> #include "Widget.h"
> 
>-#include <misc/functional.h>
>+#include <functional>
> 
> /// This widget reports the coordinate where the user clicked on
> class ClickMap : public Widget {
>diff --git a/include/GUI/DropDownBox.h b/include/GUI/DropDownBox.h
>index 12bef86..c7e7e1d 100644
>--- a/include/GUI/DropDownBox.h
>+++ b/include/GUI/DropDownBox.h
>@@ -22,11 +22,11 @@
> #include "PictureButton.h"
> #include "ListBox.h"
> 
>-#include <misc/functional.h>
> 
> #include <SDL.h>
> #include <vector>
> #include <string>
>+#include <functional>
> 
> /// A class for a dropdown box widget
> class DropDownBox : public Widget {
>diff --git a/include/GUI/ListBox.h b/include/GUI/ListBox.h
>index 9604dab..3500cae 100644
>--- a/include/GUI/ListBox.h
>+++ b/include/GUI/ListBox.h
>@@ -21,11 +21,10 @@
> #include "Widget.h"
> #include "ScrollBar.h"
> 
>-#include <misc/functional.h>
>-
> #include <SDL.h>
> #include <vector>
> #include <string>
>+#include <functional>
> 
> class DropDownBox;
> 
>diff --git a/include/GUI/ScrollBar.h b/include/GUI/ScrollBar.h
>index 5504f57..672ab16 100644
>--- a/include/GUI/ScrollBar.h
>+++ b/include/GUI/ScrollBar.h
>@@ -22,7 +22,7 @@
> #include "PictureButton.h"
> #include "TextButton.h"
> 
>-#include <misc/functional.h>
>+#include <functional>
> 
> /// A class for a scroll bar
> class ScrollBar : public Widget {
>diff --git a/include/GUI/Widget.h b/include/GUI/Widget.h
>index 62ded64..1f7fc0a 100644
>--- a/include/GUI/Widget.h
>+++ b/include/GUI/Widget.h
>@@ -20,8 +20,7 @@
> 
> #include <SDL.h>
> 
>-#include <misc/functional.h>
>-
>+#include <functional>
> #include <iostream>
> 
> /// A point class for representing a point.
>diff --git a/include/GUI/dune/ChatManager.h b/include/GUI/dune/ChatManager.h
>index 871f031..ef5268c 100644
>--- a/include/GUI/dune/ChatManager.h
>+++ b/include/GUI/dune/ChatManager.h
>@@ -22,7 +22,7 @@
> 
> #include <SDL.h>
> 
>-#include <misc/memory.h>
>+#include <memory>
> #include <string>
> #include <list>
> 
>diff --git a/include/House.h b/include/House.h
>index de8e960..e5104fe 100644
>--- a/include/House.h
>+++ b/include/House.h
>@@ -27,7 +27,7 @@
> 
> #include <players/Player.h>
> 
>-#include <misc/memory.h>
>+#include <memory>
> 
> // forward declarations
> class UnitBase;
>diff --git a/include/INIMap/INIMap.h b/include/INIMap/INIMap.h
>index 989a63a..ad77d7f 100644
>--- a/include/INIMap/INIMap.h
>+++ b/include/INIMap/INIMap.h
>@@ -30,7 +30,7 @@
> #include <SDL.h>
> 
> #include <string>
>-#include <misc/memory.h>
>+#include <memory>
> 
> 
> class INIMap {
>diff --git a/include/INIMap/INIMapLoader.h b/include/INIMap/INIMapLoader.h
>index a0f5e94..723b8f5 100644
>--- a/include/INIMap/INIMapLoader.h
>+++ b/include/INIMap/INIMapLoader.h
>@@ -27,7 +27,7 @@
> 
> #include <string>
> #include <map>
>-#include <misc/memory.h>
>+#include <memory>
> 
> 
> // forward declarations
>diff --git a/include/INIMap/INIMapPreviewCreator.h b/include/INIMap/INIMapPreviewCreator.h
>index 225e96a..c22f2b0 100644
>--- a/include/INIMap/INIMapPreviewCreator.h
>+++ b/include/INIMap/INIMapPreviewCreator.h
>@@ -27,7 +27,7 @@
> 
> #include <string>
> #include <map>
>-#include <misc/memory.h>
>+#include <memory>
> 
> 
> class INIMapPreviewCreator : public INIMap {
>diff --git a/include/MapEditor/MapEditorOperation.h b/include/MapEditor/MapEditorOperation.h
>index 54ff34b..3256321 100644
>--- a/include/MapEditor/MapEditorOperation.h
>+++ b/include/MapEditor/MapEditorOperation.h
>@@ -18,8 +18,6 @@
> #ifndef MAPEDITOROPERATION_H
> #define MAPEDITOROPERATION_H
> 
>-#include <misc/memory.h>
>-
> #include <data.h>
> 
> #include <DataTypes.h>
>@@ -29,6 +27,7 @@
> #include <MapEditor/MapInfo.h>
> 
> #include <vector>
>+#include <memory>
> 
> class MapEditor;
> 
>diff --git a/include/Network/LANGameFinderAndAnnouncer.h b/include/Network/LANGameFinderAndAnnouncer.h
>index bc9286d..1887ae8 100644
>--- a/include/Network/LANGameFinderAndAnnouncer.h
>+++ b/include/Network/LANGameFinderAndAnnouncer.h
>@@ -20,12 +20,12 @@
> 
> #include <Network/GameServerInfo.h>
> 
>-#include <misc/functional.h>
> 
> #include <enet/enet.h>
> #include <SDL.h>
> #include <string>
> #include <list>
>+#include <functional>
> 
> #define LANGAME_ANNOUNCER_PORT				    28746
> #define	LANGAME_ANNOUNCER_INTERVAL			    3000
>diff --git a/include/Network/MetaServerClient.h b/include/Network/MetaServerClient.h
>index df3ba88..84b9d41 100644
>--- a/include/Network/MetaServerClient.h
>+++ b/include/Network/MetaServerClient.h
>@@ -21,8 +21,8 @@
> #include <Network/MetaServerCommands.h>
> #include <Network/GameServerInfo.h>
> 
>-#include <misc/memory.h>
>-#include <misc/functional.h>
>+#include <memory>
>+#include <functional>
> 
> #include <enet/enet.h>
> #include <string>
>diff --git a/include/Network/NetworkManager.h b/include/Network/NetworkManager.h
>index 142f58d..16432c7 100644
>--- a/include/Network/NetworkManager.h
>+++ b/include/Network/NetworkManager.h
>@@ -26,12 +26,11 @@
> #include <Network/LANGameFinderAndAnnouncer.h>
> #include <Network/MetaServerClient.h>
> 
>-#include <misc/functional.h>
>-
> #include <enet/enet.h>
> #include <SDL.h>
> #include <string>
> #include <list>
>+#include <functional>
> #include <stdarg.h>
> 
> #define NETWORKDISCONNECT_QUIT              1
>diff --git a/include/RadarViewBase.h b/include/RadarViewBase.h
>index 0edb25c..da1c79b 100644
>--- a/include/RadarViewBase.h
>+++ b/include/RadarViewBase.h
>@@ -22,9 +22,8 @@
> 
> #include <DataTypes.h>
> 
>-#include <misc/functional.h>
>-
> #include <SDL.h>
>+#include <functional>
> 
> 
> #define NUM_STATIC_FRAMES 21
>diff --git a/include/Trigger/TriggerManager.h b/include/Trigger/TriggerManager.h
>index 2142561..cc0356a 100644
>--- a/include/Trigger/TriggerManager.h
>+++ b/include/Trigger/TriggerManager.h
>@@ -22,7 +22,7 @@
> #include <misc/InputStream.h>
> #include <misc/OutputStream.h>
> 
>-#include <misc/memory.h>
>+#include <memory>
> #include <list>
> 
> /**
>diff --git a/include/players/PlayerFactory.h b/include/players/PlayerFactory.h
>index fe26762..8602872 100644
>--- a/include/players/PlayerFactory.h
>+++ b/include/players/PlayerFactory.h
>@@ -20,7 +20,7 @@
> 
> #include <players/Player.h>
> 
>-#include <misc/functional.h>
>+#include <functional>
> 
> class PlayerFactory {
> public:
>diff --git a/src/FileClasses/PictureFactory.cpp b/src/FileClasses/PictureFactory.cpp
>index 54ac991..79f5fcc 100644
>--- a/src/FileClasses/PictureFactory.cpp
>+++ b/src/FileClasses/PictureFactory.cpp
>@@ -31,8 +31,7 @@
> #include <misc/Scaler.h>
> 
> #include <stdexcept>
>-
>-#include <misc/memory.h>
>+#include <memory>
> 
> using std::shared_ptr;
> 
>diff --git a/src/MapEditor/MapGenerator.cpp b/src/MapEditor/MapGenerator.cpp
>index a0fcc5b..8cc4e5f 100644
>--- a/src/MapEditor/MapGenerator.cpp
>+++ b/src/MapEditor/MapGenerator.cpp
>@@ -21,7 +21,7 @@
> 
> #include <misc/Random.h>
> 
>-#include <misc/memory.h>
>+#include <memory>
> 
> 
> #define ROCKFILLER 2		//how many times random generator will try to remove sand "holes" for rock from the map
>diff --git a/src/Menu/CustomGameMenu.cpp b/src/Menu/CustomGameMenu.cpp
>index 4070573..ef121db 100644
>--- a/src/Menu/CustomGameMenu.cpp
>+++ b/src/Menu/CustomGameMenu.cpp
>@@ -38,7 +38,7 @@
> 
> #include <globals.h>
> 
>-#include <misc/memory.h>
>+#include <memory>
> 
> 
> CustomGameMenu::CustomGameMenu(bool multiplayer, bool LANServer)
>diff --git a/src/Trigger/ReinforcementTrigger.cpp b/src/Trigger/ReinforcementTrigger.cpp
>index d5bad78..dce2754 100644
>--- a/src/Trigger/ReinforcementTrigger.cpp
>+++ b/src/Trigger/ReinforcementTrigger.cpp
>@@ -27,8 +27,9 @@
> #include <units/UnitBase.h>
> #include <units/Carryall.h>
> 
>-#include <misc/memory.h>
> #include <misc/strictmath.h>
>+
>+#include <memory>
> #include <stdio.h>
> 
> ReinforcementTrigger::ReinforcementTrigger(int houseID, Uint32 itemID, DropLocation location, bool bRepeat, Uint32 triggerCycleNumber) : Trigger(triggerCycleNumber)
>-- 
>2.16.1
>

Actions: View | Diff

Attachments on bug 641110: 510110 | 518940 | 518942