diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 17:54:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 20:00:17 +0200 |
| commit | 86cd29772e4f0571149c479378164572fbc96034 (patch) | |
| tree | 8f6334813634bbb4324c5be25cb43f6e13156d58 /include/cppuhelper/propertysetmixin.hxx | |
| parent | 78766aaa12ae4fae9dd2f3274617ba41de57eefd (diff) | |
remove HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY check and macro
This has been supported by GCC and clang for a very long time.
Change-Id: I410a2b39004c932003f8cbefe935aedb109b1163
Diffstat (limited to 'include/cppuhelper/propertysetmixin.hxx')
| -rw-r--r-- | include/cppuhelper/propertysetmixin.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index 0a88945727b0..446ae22a911e 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -80,7 +80,7 @@ template< typename T > class PropertySetMixin; @since UDK 3.2.1 */ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" @@ -478,7 +478,7 @@ private: PropertySetMixin( const PropertySetMixin&); // not defined void operator=( const PropertySetMixin&); // not defined }; -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ +#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ && !defined __clang__ #pragma GCC diagnostic pop #endif |