Control: tags -1 +patch
Hi!
On 3/3/21 17:12, Matthias Klose wrote:
> The package fails to build in a test rebuild on at least amd64 with
> gcc-11/g++-11, but succeeds to build with gcc-10/g++-10. The
> severity of this report will be raised before the bookworm release,
> so nothing has to be done for the bullseye release.
FWIW, upstream has fixed the issue on the stable branch already [1], see
attached patch. I'm just waiting for the upcoming stable version to be
released.
I'll then uploaded the fixed version immediately.
Adrian
> [1]
> https://github.com/FrodeSolheim/fs-uae/commit/bf81e7d2a60b2c8646663889e4a4431b988ae972
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaub...@debian.org
`. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
From bf81e7d2a60b2c8646663889e4a4431b988ae972 Mon Sep 17 00:00:00 2001
From: Frode Solheim <fr...@solheim.dev>
Date: Fri, 8 Oct 2021 11:39:16 +0200
Subject: [PATCH] Work around an incompatibility with C++17
---
src/dosbox/setup.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/dosbox/setup.h b/src/dosbox/setup.h
index db75ada8..e0a3a75d 100644
--- a/src/dosbox/setup.h
+++ b/src/dosbox/setup.h
@@ -54,6 +54,12 @@ public:
};
+#ifdef FSUAE
+// Work around an incompatibility with C++17. It does not seem like these
+// functions are used anyway.
+#define throw(...) throw()
+#endif
+
class Value {
/*
* Multitype storage container that is aware of the currently stored type in it.
@@ -113,6 +119,11 @@ private:
void set_double(std::string const& in);
};
+#ifdef FSUAE
+#undef throw
+#endif
+
+
class Property {
public:
struct Changeable { enum Value {Always, WhenIdle,OnlyAtStart};};
--
2.33.0
