diff options
| -rw-r--r-- | external/libcmis/StaticLibrary_cmis.mk | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/auth_provider.hxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/certvalidation_handler.hxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.hxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_url.cxx | 5 |
5 files changed, 24 insertions, 0 deletions
diff --git a/external/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk index eb5b4f5d581d..4eb1c97d017c 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 77fe4366f2aa..6b80ec0b9df2 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 1554785873cf..077b9670a49e 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 366b1a488228..acd45e8d65b6 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 8f5f9146d9eb..053518761976 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> |