diff options
| -rw-r--r-- | src/localconsts.h | 6 | ||||
| -rw-r--r-- | src/progs/manaplus/actions/actions.cpp | 3 |
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) |