From d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 24 Nov 2018 17:41:50 +0100 Subject: Remove obsolete GCC version checks ...after "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 --- ucb/source/ucp/cmis/cmis_content.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ucb/source/ucp/cmis/cmis_content.hxx') 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 #include -#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 -#if defined __GNUC__ && __GNUC__ >= 7 +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif -- cgit