diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-24 17:41:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-06 23:01:34 +0100 |
| commit | d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d (patch) | |
| tree | 21af0743d7f06165e43d52b4c29fb5cfba60d937 /ucb | |
| parent | 65b9c62354f77c0d3ff02dfa3151447c629ef419 (diff) | |
Remove obsolete GCC version checks
...after <https://gerrit.libreoffice.org/63951> "Bump (Linux) GCC baseline to
7.0.0". (In some cases, those checks now need to check for __clang__, which was
implicitly covered in the past by Clang consistently reporting to be
GCC 4.2.1.)
Change-Id: I860fef8c4ca41c22a7541f0fb2d34b37d1d69bed
Reviewed-on: https://gerrit.libreoffice.org/63952
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/auth_provider.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/certvalidation_handler.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_url.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx index 90bc9fe584a1..e93ad79a9c66 100644 --- a/ucb/source/ucp/cmis/auth_provider.hxx +++ b/ucb/source/ucp/cmis/auth_provider.hxx @@ -9,13 +9,13 @@ #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX #define INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" #pragma GCC diagnostic ignored "-Wunused-but-set-parameter" #endif #include <libcmis/libcmis.hxx> -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx index e5d40f0315d6..797dd5368e3f 100644 --- a/ucb/source/ucp/cmis/certvalidation_handler.hxx +++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx @@ -12,13 +12,13 @@ #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX #define INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" #pragma GCC diagnostic ignored "-Wunused-but-set-parameter" #endif #include <libcmis/libcmis.hxx> -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 6445091462f9..de6260005543 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -24,13 +24,13 @@ #include <com/sun/star/document/CmisVersion.hpp> #include <ucbhelper/contenthelper.hxx> -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" #pragma GCC diagnostic ignored "-Wunused-but-set-parameter" #endif #include <libcmis/libcmis.hxx> -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index 170c00cf9088..71e69b938d6f 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -7,13 +7,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated" #pragma GCC diagnostic ignored "-Wunused-but-set-parameter" #endif #include <libcmis/libcmis.hxx> -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif |