From 7bb78f86f15d05c7aca5566d391784df35e42db0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 24 Mar 2017 02:19:26 +0300 Subject: Add ignore some compilation options in tinyxml2 include. --- src/localconsts.h | 8 ++++++++ src/utils/xml/tinyxml2.inc | 4 ++++ 2 files changed, 12 insertions(+) (limited to 'src') diff --git a/src/localconsts.h b/src/localconsts.h index 786177138..6be9d0eaa 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -196,11 +196,19 @@ #ifdef ADVGCC #define const2 const + +#if GCC_VERSION >= 49000 +#define PRAGMA49(str) _Pragma(#str) +#else // GCC_VERSION > 49000 +#define PRAGMA49(str) +#endif // GCC_VERSION > 49000 + #if GCC_VERSION >= 60000 #define PRAGMA6(str) _Pragma(#str) #else // GCC_VERSION > 60000 #define PRAGMA6(str) #endif // GCC_VERSION > 60000 + #if GCC_VERSION >= 70000 #define A_FALLTHROUGH __attribute__ ((fallthrough)); #else // GCC_VERSION > 70000 diff --git a/src/utils/xml/tinyxml2.inc b/src/utils/xml/tinyxml2.inc index a0554e5b9..741cfa623 100644 --- a/src/utils/xml/tinyxml2.inc +++ b/src/utils/xml/tinyxml2.inc @@ -23,7 +23,11 @@ #ifdef ENABLE_TINYXML2 +PRAGMA49(GCC diagnostic push) +PRAGMA49(GCC diagnostic ignored "-Wzero-as-null-pointer-constant") +PRAGMA49(GCC diagnostic ignored "-Wsuggest-override") #include +PRAGMA49(GCC diagnostic pop) TINYXML2_INCLUDED -- cgit v1.2.3-70-g09d2