diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-16 18:10:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-16 18:10:12 +0100 |
| commit | 14ed889c45eccb16647b4fe679db2deda53ddca5 (patch) | |
| tree | 31e5726acecc36e8f181cf0e217bb427919c8eef /ucb | |
| parent | be067003098c9a9537b713742d14d8f502a9c0b7 (diff) | |
external/libcmis: Silence -Wdynamic-exception-spec errors
...with Clang in C++17 mode
Change-Id: I50a0568c13e3e7a2d37ebd739d587985b2f9bc8a
Diffstat (limited to 'ucb')
| -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 |
4 files changed, 20 insertions, 0 deletions
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> |