summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjak1 <mike.wollmann@gmail.com>2021-12-18 16:18:46 +0100
committerjak1 <mike.wollmann@gmail.com>2021-12-18 16:18:46 +0100
commit66501994d31c6e44e1c5210af09a3c5973a7ccc9 (patch)
treedcac907a1195c6d73a33f00f69ba732627d8c2eb
parent96f62b9e3f52302cbaec6c11eeb10e3e3b3b9fae (diff)
downloadmv-66501994d31c6e44e1c5210af09a3c5973a7ccc9.tar.gz
mv-66501994d31c6e44e1c5210af09a3c5973a7ccc9.tar.bz2
mv-66501994d31c6e44e1c5210af09a3c5973a7ccc9.tar.xz
mv-66501994d31c6e44e1c5210af09a3c5973a7ccc9.zip
added diagnostic ignore -Warray-bounds to gcc-snapshot (gcc11+ bug)
-rw-r--r--src/localconsts.h6
-rw-r--r--src/progs/manaplus/actions/actions.cpp3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/localconsts.h b/src/localconsts.h
index c8ac23e46..dc3afad6e 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -210,6 +210,12 @@
#define PRAGMA8(str)
#endif // GCC_VERSION > 80000
+#if GCC_VERSION >= 110000
+#define PRAGMA11(str) _Pragma(#str)
+#else // GCC_VERSION > 110000
+#define PRAGMA11(str)
+#endif // GCC_VERSION > 110000
+
#ifdef __clang__
#define PRAGMACLANG(str) _Pragma(#str)
#if CLANG_VERSION >= 50000
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index 52eca62d9..92c0f0050 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -1456,6 +1456,8 @@ impHandler0(serverUnIgnoreAll)
PRAGMA6(GCC diagnostic push)
PRAGMA6(GCC diagnostic ignored "-Wnull-dereference")
+PRAGMA11(GCC diagnostic push)
+PRAGMA11(GCC diagnostic ignored "-Warray-bounds")
impHandler0(error)
{
int *const ptr = nullptr;
@@ -1463,6 +1465,7 @@ impHandler0(error)
// logger->log("test %d", *ptr);
exit(1);
}
+PRAGMA11(GCC diagnostic pop)
PRAGMA6(GCC diagnostic pop)
impHandler(dumpGraphics)