[Libreoffice-commits] core.git: boost/boost.4874.patch

[Tor Lillqvist]

 boost/boost.4874.patch |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 4b45b7b3ea06cd9d172c438ed8f2507f8150e990
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Apr 16 16:10:26 2013 +0300

    Fix build breakage on Linux and OS X
    
    Change-Id: I206914f8f0e07097dfeed87a11b41c30ff82efe2

diff --git a/boost/boost.4874.patch b/boost/boost.4874.patch
index c4d1c44..7dbd33d 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 @@