summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-24 02:19:26 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-24 02:19:26 +0300
commit7bb78f86f15d05c7aca5566d391784df35e42db0 (patch)
tree27841f182f3e0397f0855daf73df764cbebade69
parent57bf5b505ddcb3844af903d831f5aed296ec05ef (diff)
downloadmv-7bb78f86f15d05c7aca5566d391784df35e42db0.tar.gz
mv-7bb78f86f15d05c7aca5566d391784df35e42db0.tar.bz2
mv-7bb78f86f15d05c7aca5566d391784df35e42db0.tar.xz
mv-7bb78f86f15d05c7aca5566d391784df35e42db0.zip
Add ignore some compilation options in tinyxml2 include.
-rw-r--r--src/localconsts.h8
-rw-r--r--src/utils/xml/tinyxml2.inc4
2 files changed, 12 insertions, 0 deletions
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 <tinyxml2.h>
+PRAGMA49(GCC diagnostic pop)
TINYXML2_INCLUDED