summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extensions/source/ole/oledll.cxx15
-rw-r--r--extensions/source/ole/wincrap.hxx15
-rw-r--r--extensions/source/ole/windata.hxx16
3 files changed, 46 insertions, 0 deletions
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx
index 2c07ebf970e4..f3adb8e35f54 100644
--- a/extensions/source/ole/oledll.cxx
+++ b/extensions/source/ole/oledll.cxx
@@ -24,6 +24,17 @@
#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 "-Wint-to-pointer-cast"
+#pragma clang diagnostic ignored "-Winvalid-noreturn"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#pragma clang diagnostic ignored "-Wnon-pod-varargs"
+#endif
+
#ifdef __MINGW32__
#define _INIT_ATL_COMMON_VARS
#endif
@@ -31,6 +42,10 @@
CComModule _Module;
#include <atlcom.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
#pragma warning (pop)
BEGIN_OBJECT_MAP(ObjectMap)
diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx
index 210ccf9d7c16..f47b5ce6fc9e 100644
--- a/extensions/source/ole/wincrap.hxx
+++ b/extensions/source/ole/wincrap.hxx
@@ -40,12 +40,27 @@
#include <prewin.h>
#include <list>
+#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 "-Wint-to-pointer-cast"
+#pragma clang diagnostic ignored "-Winvalid-noreturn"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#pragma clang diagnostic ignored "-Wnon-pod-varargs"
+#endif
+
// from oleobjw.hxx
#include <atlbase.h>
// from jscriptclasses.hxx
extern CComModule _Module;
#include <atlcom.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
// from unoobjw.cxx
#include <olectl.h>
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index e94610841ae8..5e6c30abcefe 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -22,10 +22,26 @@
#pragma warning (push,1)
#pragma warning (disable:4668)
#pragma warning (disable:4548)
+
#include "oleidl.h"
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+#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"
+#endif
+
#include <atlbase.h>
+
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
#pragma warning (pop)
+
#include "osl/diagnose.h"
namespace ole_adapter