git: 3416b961cead - main - games/freesynd: Fix build with clang 16
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 28 Jun 2023 20:45:51 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3416b961ceadd9d80f475ec6fe3561bafe9c987b
commit 3416b961ceadd9d80f475ec6fe3561bafe9c987b
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-06-28 20:44:15 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-06-28 20:44:15 +0000
games/freesynd: Fix build with clang 16
---
games/freesynd/files/patch-src_app.h | 21 +++++++++++++++++++++
games/freesynd/files/patch-src_dump.cpp | 11 +++++++++++
games/freesynd/files/patch-src_editor_editorapp.h | 19 +++++++++++++++++++
games/freesynd/files/patch-src_freesynd.cpp | 11 +++++++++++
4 files changed, 62 insertions(+)
diff --git a/games/freesynd/files/patch-src_app.h b/games/freesynd/files/patch-src_app.h
new file mode 100644
index 000000000000..1554bf2d04ce
--- /dev/null
+++ b/games/freesynd/files/patch-src_app.h
@@ -0,0 +1,21 @@
+--- src/app.h.orig 2016-05-01 20:07:33 UTC
++++ src/app.h
+@@ -153,13 +153,13 @@ class App : public Singleton < App > { (private)
+ private:
+ bool running_;
+ /*! A structure to hold general application informations.*/
+- std::auto_ptr<AppContext> context_;
++ std::unique_ptr<AppContext> context_;
+ /*! A structure to hold player informations.*/
+- std::auto_ptr<GameSession> session_;
++ std::unique_ptr<GameSession> session_;
+ /*! Controls the game logic. */
+- std::auto_ptr<GameController> game_ctlr_;
+- std::auto_ptr<Screen> screen_;
+- std::auto_ptr<System> system_;
++ std::unique_ptr<GameController> game_ctlr_;
++ std::unique_ptr<Screen> screen_;
++ std::unique_ptr<System> system_;
+
+ std::string iniPath_;
+
diff --git a/games/freesynd/files/patch-src_dump.cpp b/games/freesynd/files/patch-src_dump.cpp
new file mode 100644
index 000000000000..c10f5972ad65
--- /dev/null
+++ b/games/freesynd/files/patch-src_dump.cpp
@@ -0,0 +1,11 @@
+--- src/dump.cpp.orig 2016-05-01 20:07:33 UTC
++++ src/dump.cpp
+@@ -584,7 +584,7 @@ int main(int argc, char *argv[]) {
+ }
+
+ LOG(Log::k_FLG_INFO, "Main", "main", ("----- Initializing application..."))
+- std::auto_ptr<EditorApp> app(new EditorApp(disable_sound));
++ std::unique_ptr<EditorApp> app(new EditorApp(disable_sound));
+
+ if (app->initialize(iniPath)) {
+ LOG(Log::k_FLG_INFO, "Main", "main", ("----- Initializing application completed"))
diff --git a/games/freesynd/files/patch-src_editor_editorapp.h b/games/freesynd/files/patch-src_editor_editorapp.h
new file mode 100644
index 000000000000..5459198c8641
--- /dev/null
+++ b/games/freesynd/files/patch-src_editor_editorapp.h
@@ -0,0 +1,19 @@
+--- src/editor/editorapp.h.orig 2016-05-01 20:07:33 UTC
++++ src/editor/editorapp.h
+@@ -122,12 +122,12 @@ class EditorApp : public Singleton < EditorApp > { (pr
+ private:
+ bool running_;
+
+- std::auto_ptr<Screen> screen_;
+- std::auto_ptr<System> system_;
++ std::unique_ptr<Screen> screen_;
++ std::unique_ptr<System> system_;
+ /*! A structure to hold general application informations.*/
+- std::auto_ptr<AppContext> context_;
++ std::unique_ptr<AppContext> context_;
+ /*! Controls the game logic. */
+- std::auto_ptr<GameController> game_ctlr_;
++ std::unique_ptr<GameController> game_ctlr_;
+
+ std::string iniPath_;
+
diff --git a/games/freesynd/files/patch-src_freesynd.cpp b/games/freesynd/files/patch-src_freesynd.cpp
new file mode 100644
index 000000000000..abd822874ac6
--- /dev/null
+++ b/games/freesynd/files/patch-src_freesynd.cpp
@@ -0,0 +1,11 @@
+--- src/freesynd.cpp.orig 2016-05-01 20:07:33 UTC
++++ src/freesynd.cpp
+@@ -229,7 +229,7 @@ int main(int argc, char *argv[]) {
+ }
+
+ LOG(Log::k_FLG_INFO, "Main", "main", ("----- Initializing application..."))
+- std::auto_ptr<App> app(new App(disable_sound));
++ std::unique_ptr<App> app(new App(disable_sound));
+
+ if (app->initialize(iniPath)) {
+ // setting the cheat codes