[Libreoffice-commits] .: boost/boost_1_44_0-clang-warnings.patch

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 5 23:53:01 PST 2012


 boost/boost_1_44_0-clang-warnings.patch |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 798ecdf4ec21199d21661632ed6b17de5e79e120
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 6 08:49:34 2012 +0100

    Improve check for -Wself-assign-field
    
    Change-Id: I57e43362f896ad08d4af408f4fac63d26b71bffa

diff --git a/boost/boost_1_44_0-clang-warnings.patch b/boost/boost_1_44_0-clang-warnings.patch
index ed81ce5..df0883c 100644
--- a/boost/boost_1_44_0-clang-warnings.patch
+++ b/boost/boost_1_44_0-clang-warnings.patch
@@ -15,15 +15,15 @@
    {
      BOOST_CONCEPT_USAGE(Assignable) {
  #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
-+#if defined __clang__ && !defined(__APPLE__)
-+#if __clang_major__ == 3 && __clang_minor__ >= 2 || __clang_major__ > 3
++#if defined __clang__
++#if __has_warning("-Wself-assign-field")
 +#pragma clang diagnostic push
 +#pragma clang diagnostic ignored "-Wself-assign-field"
 +#endif
 +#endif
        a = a;             // require assignment operator
-+#if defined __clang__ && !defined(__APPLE__)
-+#if __clang_major__ == 3 && __clang_minor__ >= 2 || __clang_major__ > 3
++#if defined __clang__
++#if __has_warning("-Wself-assign-field")
 +#pragma clang diagnostic pop
 +#endif
 +#endif


More information about the Libreoffice-commits mailing list