enable boost::multi_array

2 files changed, 226 insertions, 0 deletions

diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
new file mode 100644
index 000000000000..a307c315f05a
--- /dev/null
+++ b/boost/boost.6397.warnings.patch
@@ -0,0 +1,222 @@
+--- misc/boost_1_44_0/boost/multi_array/collection_concept.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp	2012-01-12 20:28:55.457287835 +0000
+@@ -43,11 +43,11 @@
+       i = c.end();
+       c.swap(c);
+     }
+-    void const_constraints(const Collection& c) {
+-      ci = c.begin();
+-      ci = c.end();
+-      n = c.size();
+-      b = c.empty();
++    void const_constraints(const Collection& c_) {
++      ci = c_.begin();
++      ci = c_.end();
++      n = c_.size();
++      b = c_.empty();
+     }
+     Collection c;
+     bool b;
+--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp	2012-01-12 20:29:56.482879277 +0000
+@@ -39,8 +39,8 @@
+ 
+     template <typename Array, typename IdxGen, typename Call_Type>
+     static void call(Array& a, const IdxGen& idgen, Call_Type c) {
+-      typedef typename Array::index_range index_range;
+-      typedef typename Array::index index;
++      typedef typename Array::index_range index_range_;
++      typedef typename Array::index index_;
+       idgen_helper<N-1>::call(a,idgen[c],c);
+     }
+   };
+@@ -50,8 +50,8 @@
+ 
+     template <typename Array, typename IdxGen, typename Call_Type>
+     static void call(Array& a, const IdxGen& idgen, Call_Type) {
+-      typedef typename Array::index_range index_range;
+-      typedef typename Array::index index;
++      typedef typename Array::index_range index_range_;
++      typedef typename Array::index index_;
+       a[ idgen ];
+     }
+   };
+@@ -153,27 +153,27 @@
+       const_constraints(a);
+     }
+ 
+-    void const_constraints(const Array& a) {
++    void const_constraints(const Array& a_) {
+ 
+       //      value_type vt = a[ id ];
+ 
+       // Test slicing, keeping only the first dimension, losing the rest
+-      idgen_helper<NumDims-1>::call(a,idgen[range],id);
++      idgen_helper<NumDims-1>::call(a_,idgen[range],id);
+ 
+       // Test slicing, keeping all dimensions.
+-      idgen_helper<NumDims-1>::call(a,idgen[range],range);
++      idgen_helper<NumDims-1>::call(a_,idgen[range],range);
+ 
+-      st = a.size();
+-      st = a.num_dimensions();
+-      st = a.num_elements();
+-      stp = a.shape();
+-      idp = a.strides();
+-      idp = a.index_bases();
+-      cit = a.begin();
+-      cit = a.end();
+-      crit = a.rbegin();
+-      crit = a.rend();
+-      eltp = a.origin();
++      st = a_.size();
++      st = a_.num_dimensions();
++      st = a_.num_elements();
++      stp = a_.shape();
++      idp = a_.strides();
++      idp = a_.index_bases();
++      cit = a_.begin();
++      cit = a_.end();
++      crit = a_.rbegin();
++      crit = a_.rend();
++      eltp = a_.origin();
+     }
+ 
+     typedef typename Array::value_type value_type;
+--- misc/boost_1_44_0/boost/multi_array/extent_range.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/extent_range.hpp	2012-01-12 20:32:16.696241748 +0000
+@@ -26,11 +26,11 @@
+   typedef Extent index;
+   typedef SizeType size_type;
+ 
+-  extent_range(index start, index finish) :
+-    super_type(start,finish) { }
++  extent_range(index start_, index finish_) :
++    super_type(start_,finish_) { }
+ 
+-  extent_range(index finish) :
+-    super_type(0,finish) { }
++  extent_range(index finish_) :
++    super_type(0,finish_) { }
+ 
+   extent_range() : super_type(0,0) { }
+ 
+--- misc/boost_1_44_0/boost/multi_array/index_range.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/index_range.hpp	2012-01-12 20:31:29.405781105 +0000
+@@ -60,8 +60,8 @@
+       degenerate_ = true;
+     }
+ 
+-    explicit index_range(index start, index finish, index stride=1)
+-      : start_(start), finish_(finish), stride_(stride),
++    explicit index_range(index i_start, index i_finish, index i_stride=1)
++      : start_(i_start), finish_(i_finish), stride_(i_stride),
+         degenerate_(false)
+     { }
+ 
+@@ -107,11 +107,11 @@
+ 
+     index stride() const { return stride_; }
+ 
+-    void set_index_range(index start, index finish, index stride=1)
++    void set_index_range(index i_start, index i_finish, index i_stride=1)
+     {
+-      start_ = start;
+-      finish_ = finish;
+-      stride_ = stride;
++      start_ = i_start;
++      finish_ = i_finish;
++      stride_ = i_stride;
+     }
+ 
+     static index_range all() 
+--- misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/multi_array_ref.hpp	2012-01-12 20:25:49.280492556 +0000
+@@ -124,13 +124,13 @@
+   }
+   
+   template <class InputIterator>
+-  void assign(InputIterator begin, InputIterator end) {
++  void assign(InputIterator begin_, InputIterator end_) {
+     boost::function_requires<InputIteratorConcept<InputIterator> >();
+ 
+-    InputIterator in_iter = begin;
++    InputIterator in_iter = begin_;
+     T* out_iter = base_;
+     std::size_t copy_count=0;
+-    while (in_iter != end && copy_count < num_elements_) {
++    while (in_iter != end_ && copy_count < num_elements_) {
+       *out_iter++ = *in_iter++;
+       copy_count++;      
+     }
+@@ -327,15 +327,15 @@
+   explicit
+   const_multi_array_ref(TPtr base,
+                         const storage_order_type& so,
+-                        const index * index_bases,
++                        const index * index_bases_,
+                         const size_type* extents) :
+     base_(base), storage_(so), origin_offset_(0), directional_offset_(0)
+  {
+-   // If index_bases or extents is null, then initialize the corresponding
++   // If index_bases_ or extents is null, then initialize the corresponding
+    // private data to zeroed lists.
+-   if(index_bases) {
++   if(index_bases_) {
+      boost::detail::multi_array::
+-       copy_n(index_bases,NumDims,index_base_list_.begin());
++       copy_n(index_bases_,NumDims,index_base_list_.begin());
+    } else {
+      std::fill_n(index_base_list_.begin(),NumDims,0);
+    }
+--- misc/boost_1_44_0/boost/multi_array/storage_order.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/storage_order.hpp	2012-01-12 20:30:57.667472937 +0000
+@@ -34,10 +34,10 @@
+   public:
+     typedef detail::multi_array::size_type size_type;
+     template <typename OrderingIter, typename AscendingIter>
+-    general_storage_order(OrderingIter ordering,
+-                          AscendingIter ascending) {
+-      boost::detail::multi_array::copy_n(ordering,NumDims,ordering_.begin());
+-      boost::detail::multi_array::copy_n(ascending,NumDims,ascending_.begin());
++    general_storage_order(OrderingIter i_ordering,
++                          AscendingIter i_ascending) {
++      boost::detail::multi_array::copy_n(i_ordering,NumDims,ordering_.begin());
++      boost::detail::multi_array::copy_n(i_ascending,NumDims,ascending_.begin());
+     }
+ 
+     // RG - ideally these would not be necessary, but some compilers
+--- misc/boost_1_44_0/boost/multi_array/subarray.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/subarray.hpp	2012-01-12 20:27:12.346292228 +0000
+@@ -181,9 +181,9 @@
+ 
+   const_sub_array (TPtr base,
+                  const size_type* extents,
+-                 const index* strides,
++                 const index* i_strides,
+                  const index* index_base) :
+-    base_(base), extents_(extents), strides_(strides),
++    base_(base), extents_(extents), strides_(i_strides),
+     index_base_(index_base) {
+   }
+ 
+--- misc/boost_1_44_0/boost/multi_array/view.hpp	2012-01-12 20:21:29.790009198 +0000
++++ misc/build/boost_1_44_0/boost/multi_array/view.hpp	2012-01-12 20:26:36.350945110 +0000
+@@ -231,7 +231,7 @@
+   template <typename ExtentList, typename Index>
+   explicit const_multi_array_view(TPtr base,
+                            const ExtentList& extents,
+-                           const boost::array<Index,NumDims>& strides): 
++                           const boost::array<Index,NumDims>& strides_): 
+     base_(base), origin_offset_(0) {
+ 
+     index_base_list_.assign(0);
+@@ -240,7 +240,7 @@
+     boost::detail::multi_array::
+       copy_n(extents.begin(),NumDims,extent_list_.begin());
+     boost::detail::multi_array::
+-      copy_n(strides.begin(),NumDims,stride_list_.begin());
++      copy_n(strides_.begin(),NumDims,stride_list_.begin());
+ 
+     // Calculate the array size
+     num_elements_ = std::accumulate(extent_list_.begin(),extent_list_.end(),
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 085e1c71f279..f9cd078257a1 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -61,6 +61,8 @@ PATCH_FILES+=boost.5119.unordered_map-cp-ctor.patch
 PATCH_FILES+=boost.gcc47679.patch
 #https://svn.boost.org/trac/boost/ticket/6369
 PATCH_FILES+=boost.6369.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/6397
+PATCH_FILES+=boost.6397.warnings.patch
 
 PATCH_FILES+=boost.windows.patch
 
@@ -111,6 +113,8 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_array $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_index $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME)
     @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)