Kaydet (Commit) 168bf789 authored tarafından Michael Stahl's avatar Michael Stahl

boost: fix Clang > 3.5 -Wunused-local-typedefs in concept_check

Change-Id: I84ee651a51e1919be036ffd47d80eb1ab7433973
üst aedd0030
...@@ -93,6 +93,8 @@ boost_patches += boost_1_59_0.multi_array.wshadow.patch ...@@ -93,6 +93,8 @@ boost_patches += boost_1_59_0.multi_array.wshadow.patch
boost_patches += boost_1_59_0.signal2.wshadow.patch boost_patches += boost_1_59_0.signal2.wshadow.patch
# https://svn.boost.org/trac/boost/ticket/11501 # https://svn.boost.org/trac/boost/ticket/11501
boost_patches += boost_1_59_0.property_tree.wreturn-type.patch boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
# fixed upstream by bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4
boost_patches += boost.concept_check.Wunused-local-typedefs.warnings.patch.1
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
......
Fixed differently upstream by commit bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4
--- boost/boost/concept/detail/general.hpp.orig 2015-07-31 14:03:08.184447736 +0200
+++ boost/boost/concept/detail/general.hpp 2015-07-31 14:03:10.048447591 +0200
@@ -67,7 +67,7 @@
// Version check from https://svn.boost.org/trac/boost/changeset/82886
// (boost/static_assert.hpp)
-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
+#if defined(__GNUC__) && (((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) || defined(__clang__))
#define BOOST_CONCEPT_UNUSED_TYPEDEF __attribute__((unused))
#else
#define BOOST_CONCEPT_UNUSED_TYPEDEF /**/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment