[Libreoffice-commits] core.git: desktop/source

Stephan Bergmann sbergman at redhat.com
Wed May 25 13:06:24 UTC 2016


 desktop/source/app/crashreport.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit b408317af902c31826cc6024bc1314c1419d9f7a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 25 15:05:52 2016 +0200

    Silence clang-cl -Werror,-Wmicrosoft-enum-value in external include
    
    Change-Id: Ic08f063efc27e4bd573c684955e69edb7e4f8bc1

diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index c2a569a..b1866f5 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -24,7 +24,14 @@ osl::Mutex CrashReporter::maMutex;
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
 #include <client/linux/handler/exception_handler.h>
 #elif defined WNT
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmicrosoft-enum-value"
+#endif
 #include <client/windows/handler/exception_handler.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
 #endif
 
 google_breakpad::ExceptionHandler* CrashReporter::mpExceptionHandler = nullptr;


More information about the Libreoffice-commits mailing list