diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-16 16:10:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-16 16:11:55 +0300 |
| commit | 4b45b7b3ea06cd9d172c438ed8f2507f8150e990 (patch) | |
| tree | 84eb1b73abceaf48f8f1541b16a43795dd5c8f94 /boost | |
| parent | 336353a87e6003e685aab87ea74a158546e1f297 (diff) | |
Fix build breakage on Linux and OS X
Change-Id: I206914f8f0e07097dfeed87a11b41c30ff82efe2
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost.4874.patch | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/boost/boost.4874.patch b/boost/boost.4874.patch index c4d1c442ec5a..7dbd33def32b 100644 --- a/boost/boost.4874.patch +++ b/boost/boost.4874.patch @@ -2,6 +2,14 @@ Index: branches/release/boost/multi_array/base.hpp =================================================================== --- a/branches/release/boost/multi_array/base.hpp +++ b/branches/release/boost/multi_array/base.hpp +@@ -18,6 +18,7 @@ + // functionality is acquired + // + ++#include "boost/multi_array/collection_concept.hpp" + #include "boost/multi_array/extent_range.hpp" + #include "boost/multi_array/extent_gen.hpp" + #include "boost/multi_array/index_range.hpp" @@ -82,5 +82,6 @@ class const_sub_array; @@ -51,7 +59,7 @@ Index: branches/release/boost/multi_array/base.hpp const index* index_bases) const { - + boost::function_requires< -+ CollectionConcept<IndexList> >(); ++ detail::multi_array::CollectionConcept<IndexList> >(); ignore_unused_variable_warning(index_bases); ignore_unused_variable_warning(extents); @@ -333,7 +355,13 @@ |