diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-31 12:30:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-31 12:30:13 +0100 |
| commit | c866ace49f4a394185b412559fbcbb67718a2fcf (patch) | |
| tree | 6320db58078b4662e7d165b1070d13f7c06cae46 /ucb | |
| parent | 1b12381203c6a059a5c5e38ebebfe703f5b11c01 (diff) | |
Revert "Avoid warning with Clang that doesn't have -Wunused-but-set-parameter"
This reverts commit d69bc9c939b94718ac9e17a62f62ae7ae87776e5, which isn't needed
any more now that 01aa52b5e91bac740ad21c31968c834c1530831e "Work around
-Werror,-Wunknown-pragmas" makes the whole pragma block conditional on
__GNUC__ >= 7
(which Clang does not fulfill).
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/auth_provider.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/certvalidation_handler.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_url.cxx | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx index bce846837829..77fe4366f2aa 100644 --- a/ucb/source/ucp/cmis/auth_provider.hxx +++ b/ucb/source/ucp/cmis/auth_provider.hxx @@ -12,10 +12,8 @@ #if defined __GNUC__ && __GNUC__ >= 7 #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__ && __GNUC__ >= 7 #pragma GCC diagnostic pop diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx index e20c926d834f..1554785873cf 100644 --- a/ucb/source/ucp/cmis/certvalidation_handler.hxx +++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx @@ -15,10 +15,8 @@ #if defined __GNUC__ && __GNUC__ >= 7 #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__ && __GNUC__ >= 7 #pragma GCC diagnostic pop diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 370fe3124204..366b1a488228 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -27,10 +27,8 @@ #if defined __GNUC__ && __GNUC__ >= 7 #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__ && __GNUC__ >= 7 #pragma GCC diagnostic pop diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index a54a67f13872..8f5f9146d9eb 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -10,10 +10,8 @@ #if defined __GNUC__ && __GNUC__ >= 7 #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__ && __GNUC__ >= 7 #pragma GCC diagnostic pop |