mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence clang-cl warnings in ATL headers

Browse Source 
Change-Id: Id94279d0086bc29569783f4e0b5d975be162e823
This commit is contained in:
Stephan Bergmann
2015-11-30 14:07:10 +01:00
parent f6bb9d1696
commit c59646dce5
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
embedserv/source/inc/embeddocaccess.hxx
View File

@@ -30,7 +30,15 @@
#include <oleidl.h> #include <oleidl.h>
#ifndef __MINGW32__ #ifndef __MINGW32__
#pragma warning(disable : 4265) #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> #include <atldbcli.h>
#if defined __clang__
#pragma clang diagnostic pop
#endif
#endif #endif
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>

16
embedserv/source/inc/stdafx.h
View File

@@ -17,6 +17,19 @@
#pragma warning(push) #pragma warning(push)
#pragma warning(push, 1) #pragma warning(push, 1)
#pragma warning(disable: 4548) #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 #endif
#include <atlbase.h> #include <atlbase.h>
//You may derive a class from CComModule and use it if you want to override //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. // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#ifdef _MSC_VER #ifdef _MSC_VER
#if defined __clang__
#pragma clang diagnostic pop
#endif
#pragma warning(pop) #pragma warning(pop)
#pragma warning(pop) #pragma warning(pop)
#endif #endif