summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-30 14:07:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-12-02 08:02:18 +0100
commitc59646dce5d4469c0b83d5c32510ae4e431b7dc3 (patch)
tree9fb6356c22b536574d24517a0b2dc30101708090
parentf6bb9d16965cd672957a87e780f88819bc01d567 (diff)
Silence clang-cl warnings in ATL headers
Change-Id: Id94279d0086bc29569783f4e0b5d975be162e823
-rw-r--r--embedserv/source/inc/embeddocaccess.hxx8
-rw-r--r--embedserv/source/inc/stdafx.h16
2 files changed, 24 insertions, 0 deletions
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index 01e87e93ccbf..712167bb2c16 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -30,7 +30,15 @@
#include <oleidl.h>
#ifndef __MINGW32__
#pragma warning(disable : 4265)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#endif
#include <atldbcli.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
#endif
#include <cppuhelper/weak.hxx>
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index 8ecf254a7487..7b147a8e2202 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -17,6 +17,19 @@
#pragma warning(push)
#pragma warning(push, 1)
#pragma warning(disable: 4548)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wattributes"
+#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#pragma clang diagnostic ignored "-Wdynamic-class-memaccess"
+#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#pragma clang diagnostic ignored "-Winvalid-noreturn"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#pragma clang diagnostic ignored "-Wnon-pod-varargs"
+#pragma clang diagnostic ignored "-Wsequence-point"
+#pragma clang diagnostic ignored "-Wtypename-missing"
+#endif
#endif
#include <atlbase.h>
//You may derive a class from CComModule and use it if you want to override
@@ -34,6 +47,9 @@ using ::std::max;
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#ifdef _MSC_VER
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
#pragma warning(pop)
#pragma warning(pop)
#endif