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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 23 01:16:42 PDT 2012


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

New commits:
commit eb016138e817d686795e1902a7a295d93639da27
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Oct 23 00:25:40 2012 +0300

    Apple's Clang 4.1 does not have -Wself-assign-field
    
    Change-Id: Iac87cae6e9ee0e4efa07f64903f8789fa47869cc

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


More information about the Libreoffice-commits mailing list