[Libreoffice-commits] core.git: include/cppuhelper

[Stephan Bergmann]

 include/cppuhelper/propertysetmixin.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a1b1b79adb9f93a1bb503862675bc42814900ac9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 16 14:41:45 2014 +0200

    For GCC 4.9, extend range where -Wnon-virtual-dtor is ignored
    
    Change-Id: Ib44f5b2f6be7ae583d8931fc8bf5cb060ef21610

diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx
index 88d460b..0a88945 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -403,10 +403,6 @@ private:
 
     void checkUnknown(rtl::OUString const & propertyName);
 };
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
-    && !defined __clang__
-#pragma GCC diagnostic pop
-#endif
 
 /**
    @short A helper mixin to implement certain UNO interfaces related to property
@@ -482,6 +478,10 @@ private:
     PropertySetMixin( const PropertySetMixin&); // not defined
     void operator=( const PropertySetMixin&); // not defined
 };
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+    && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
 
 #if defined _MSC_VER
 #pragma warning(pop)