[Libreoffice-commits] core.git: external/libcmis ucb/source

[Stephan Bergmann]

 external/libcmis/StaticLibrary_cmis.mk         |    4 ++++
 ucb/source/ucp/cmis/auth_provider.hxx          |    5 +++++
 ucb/source/ucp/cmis/certvalidation_handler.hxx |    5 +++++
 ucb/source/ucp/cmis/cmis_content.hxx           |    5 +++++
 ucb/source/ucp/cmis/cmis_url.cxx               |    5 +++++
 5 files changed, 24 insertions(+)

New commits:
commit 14ed889c45eccb16647b4fe679db2deda53ddca5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 16 18:10:12 2017 +0100

    external/libcmis: Silence -Wdynamic-exception-spec errors
    
    ...with Clang in C++17 mode
    
    Change-Id: I50a0568c13e3e7a2d37ebd739d587985b2f9bc8a

diff --git a/external/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk
index eb5b4f5..4eb1c97 100644
--- a/external/libcmis/StaticLibrary_cmis.mk
+++ b/external/libcmis/StaticLibrary_cmis.mk
@@ -14,8 +14,12 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,cmislib))
 ifeq ($(COM_IS_CLANG),TRUE)
 # Avoid narrowing conversion error (even though the option is technically a warning)
 # caused by boost.
+# Also avoid -Wdynamic-exception-spec errors in C++17 mode.
 $(eval $(call gb_StaticLibrary_add_cxxflags,cmislib,\
     -Wno-error=c++11-narrowing \
+    $(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
+            $(CXXFLAGS_CXX11)), \
+        -Wno-error=dynamic-exception-spec) \
 ))
 endif
 
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index 77fe436..6b80ec0 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -13,10 +13,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 15547858..077b967 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -16,10 +16,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 366b1a4..acd45e8 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -28,10 +28,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include <list>
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 8f5f914..05351876 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -11,10 +11,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
 #endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
+#elif defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
 #endif
 
 #include <config_oauth2.h>