diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 18:15:41 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 20:00:18 +0200 |
commit | 3b59dbbffdb73e48f9e2398bb1eecc24e3d95e13 (patch) | |
tree | 8b58bba8c42110e10f6763b598f294bf7359b1f0 /include/cppuhelper | |
parent | remove HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY check and macro (diff) | |
download | core-3b59dbbffdb73e48f9e2398bb1eecc24e3d95e13.tar.gz core-3b59dbbffdb73e48f9e2398bb1eecc24e3d95e13.zip |
remove HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE check and macro
This is supported in GCC 4.6.0 already:
https://gcc.gnu.org/onlinedocs/gcc-4.6.0/gcc/Diagnostic-Pragmas.html
Change-Id: I2f67e588eea3a323a2e9c81e39e56ab2e715a817
Diffstat (limited to 'include/cppuhelper')
-rw-r--r-- | include/cppuhelper/propertysetmixin.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index 446ae22a911e..73df16550951 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -80,8 +80,7 @@ template< typename T > class PropertySetMixin; @since UDK 3.2.1 */ -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #endif @@ -478,8 +477,7 @@ private: PropertySetMixin( const PropertySetMixin&); // not defined void operator=( const PropertySetMixin&); // not defined }; -#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \ - && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif |