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

Stephan Bergmann sbergman at redhat.com
Tue Jan 31 10:57:05 UTC 2017


 ucb/source/ucp/cmis/auth_provider.hxx          |    4 ++--
 ucb/source/ucp/cmis/certvalidation_handler.hxx |    4 ++--
 ucb/source/ucp/cmis/cmis_content.hxx           |    4 ++--
 ucb/source/ucp/cmis/cmis_url.cxx               |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 01aa52b5e91bac740ad21c31968c834c1530831e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 31 11:55:22 2017 +0100

    Work around -Werror,-Wunknown-pragmas
    
    ...from GCC < 7 not knowing -Wunused-but-set-parameter
    
    Change-Id: I6494882085ad39df8d7b94fa062a7717bffacadb

diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index c7388ef..bce8468 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -17,7 +17,7 @@
 #endif
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 04dd44f..e20c926 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -12,7 +12,7 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -20,7 +20,7 @@
 #endif
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 867c5d0..370fe31 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/document/CmisVersion.hpp>
 #include <ucbhelper/contenthelper.hxx>
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -32,7 +32,7 @@
 #endif
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 927d9db..a54a67f 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -15,7 +15,7 @@
 #endif
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 


More information about the Libreoffice-commits mailing list