From 1ac24adde27cdd6b3f4f30167648396825779eee Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Sun, 22 Feb 2015 21:15:47 +0000 Subject: [PATCH] Disables some SpiderMonkey-related build warnings with clang This was SVN commit r16379. --- source/scriptinterface/ScriptExtraHeaders.h | 7 +++++++ source/scriptinterface/ScriptTypes.h | 1 + 2 files changed, 8 insertions(+) diff --git a/source/scriptinterface/ScriptExtraHeaders.h b/source/scriptinterface/ScriptExtraHeaders.h index d37f7bb6b5..1ab53f05b8 100644 --- a/source/scriptinterface/ScriptExtraHeaders.h +++ b/source/scriptinterface/ScriptExtraHeaders.h @@ -31,6 +31,10 @@ # pragma GCC diagnostic ignored "-Wredundant-decls" # pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #endif +#if CLANG_VERSION +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wmismatched-tags" +#endif #if MSC_VERSION // reduce the warning level for the SpiderMonkey headers # pragma warning(push, 1) @@ -51,6 +55,9 @@ #if MSC_VERSION # pragma warning(pop) #endif +#if CLANG_VERSION +# pragma clang diagnostic pop +#endif #if GCC_VERSION # pragma GCC diagnostic pop #endif diff --git a/source/scriptinterface/ScriptTypes.h b/source/scriptinterface/ScriptTypes.h index 2daae1b5f8..95c589fb3f 100644 --- a/source/scriptinterface/ScriptTypes.h +++ b/source/scriptinterface/ScriptTypes.h @@ -51,6 +51,7 @@ # pragma clang diagnostic ignored "-Wuninitialized" # pragma clang diagnostic ignored "-Wc++11-extensions" # pragma clang diagnostic ignored "-Wignored-qualifiers" +# pragma clang diagnostic ignored "-Wmismatched-tags" // Ugly hack to deal with macro redefinitions from libc++ # ifdef nullptr # undef nullptr