external/boost/boost.wdeprecated-auto_ptr.patch.0 | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 8b3bb1ee9dd7062f7ab988ccd358556b75a373fa
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Oct 6 09:28:48 2014 +0200
Even latest Clang only claims GCC 4.2
Change-Id: I70d117f62b91c4d413add44368836c870f203f28
diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0
b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index 9be0eea..b92d773 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -4,7 +4,7 @@
# pragma once
#endif
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -16,7 +16,7 @@
}
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
@@ -27,7 +27,7 @@
# pragma once
#endif
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -39,7 +39,7 @@
} // namespace 'boost'
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
@@ -50,7 +50,7 @@
# pragma once
#endif
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -62,7 +62,7 @@
} // namespace 'boost'
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
@@ -73,7 +73,7 @@
# pragma once
#endif
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -84,7 +84,7 @@
} // namespace 'boost'
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
@@ -95,7 +95,7 @@
# pragma once
#endif
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -107,7 +107,7 @@
}
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
@@ -118,7 +118,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -130,7 +130,7 @@
# pragma warn .8027 // Functions containing try are not expanded inline
#endif
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
@@ -141,7 +141,7 @@
// http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
//
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -153,7 +153,7 @@
} // namespace boost
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
@@ -164,7 +164,7 @@
// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
//
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
@@ -176,7 +176,7 @@
#endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) &&
!defined(BOOST_MSVC6_MEMBER_TEMPLATES)
-+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) ||
defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
