summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-01 13:56:39 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-01 13:56:39 +0200
commitbf52bd94a9395b0a6e96a6648bcb3a2aa301f32d (patch)
treeddc7cea7cb0e2936853c6b09c5425340c9d3a231
parentc9226b841a056246c349177f4a4d62ed8b93bf00 (diff)
boost: fix -Wundef in multi_array/base.hpp
Change-Id: Ice8a2863f7b8c80a1fa9875b099394a16590b97e
-rw-r--r--boost/UnpackedTarball_boost.mk1
-rw-r--r--boost/boost.wundef.patch.111
2 files changed, 12 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 298768210cf8..482bbfa26bda 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -34,6 +34,7 @@ boost_patches += boost.6940.glibc.patch
boost_patches += boost.7774.warnings.patch.1
#https://svn.boost.org/trac/boost/ticket/6142
boost_patches += boost.6142.warnings.patch.1
+boost_patches += boost.wundef.patch.1
boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch
diff --git a/boost/boost.wundef.patch.1 b/boost/boost.wundef.patch.1
new file mode 100644
index 000000000000..981492858edc
--- /dev/null
+++ b/boost/boost.wundef.patch.1
@@ -0,0 +1,11 @@
+--- a/boost/multi_array/base.hpp 2013-04-01 13:53:59.565375431 +0200
++++ b/boost/multi_array/base.hpp 2013-04-01 13:54:03.230375652 +0200
+@@ -65,7 +65,7 @@
+ // object creation in small-memory environments. Thus, the objects
+ // can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS
+ // before loading multi_array.hpp.
+-#if !BOOST_MULTI_ARRAY_NO_GENERATORS
++#ifndef BOOST_MULTI_ARRAY_NO_GENERATORS
+ namespace {
+ multi_array_types::extent_gen extents;
+ multi_array_types::index_gen indices;