diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-23 21:55:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-25 08:52:54 +0100 |
| commit | fa545023ada3f2a5f79cab1ff628fd18434c7c2e (patch) | |
| tree | 7bb5c0f01264f9b53724baa1b0ef7b7e80e23b3d /ucb/source/ucp/webdav-neon | |
| parent | c940e3d8b3895c550fb37e0e9acbd19b4bb3515e (diff) | |
Introduce HAVE_GCC_PRAGMA_DIAGNOSTIC_{MODIFY,SCOPE}
...replacing hard-coded GCC version checks. Those checks that guard
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
appear relevant only for GCC itself, not Clang (which used to fail the old
guards because it typically announces itself with a rather low
__GNUC__/__GNUC_MINOR__ version), see 6e67c03dc0225fc66343546b14e902b9d238b1a3
"Enable -Wnon-virtual-dtor for GCC 4.6"
Change-Id: I6bfa4d5caa6192e7a203ce829682bf6bb8d61a1b
Diffstat (limited to 'ucb/source/ucp/webdav-neon')
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonUri.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index 5886429d2089..e578ccfc4691 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include "sal/config.h" #include <string.h> #include <rtl/uri.hxx> @@ -45,15 +46,9 @@ using namespace webdav_ucp; # pragma disable_warn # endif -#if defined __GNUC__ -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) -/* Diagnostics pragma was introduced with gcc-4.2.1 */ -#if GCC_VERSION >= 40201 +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY #pragma GCC diagnostic ignored "-Wwrite-strings" #endif -#endif namespace { |