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

[Tor Lillqvist]

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

New commits:
commit d69bc9c939b94718ac9e17a62f62ae7ae87776e5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 31 12:18:29 2017 +0200

    Avoid warning with Clang that doesn't have -Wunused-but-set-parameter
    
    Change-Id: I8d016e9959898a90bff9d1e4734cbef37592a97e

diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index 4e560d6..c7388ef 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -12,8 +12,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 9519268..04dd44f 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -15,8 +15,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 96ac275..867c5d0 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -27,8 +27,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 6d42172..927d9db 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -10,8 +10,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include <libcmis/libcmis.hxx>
 #if defined __GNUC__
 #pragma GCC diagnostic pop