-Werror,-Wshadow

Change-Id: Idd8404cd882181e571da5fd5c02890a0bf4d1a0a

1 files changed, 165 insertions, 3 deletions

diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
index cf24c9efffca..383945e81456 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -153,6 +153,35 @@
      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
+@@ -86,24 +86,24 @@
+       num_elements_(other.num_elements_)  {  }
+ 
+   template <typename ExtentList>
+-  explicit const_multi_array_ref(TPtr base, const ExtentList& extents) :
++  explicit const_multi_array_ref(TPtr base, const ExtentList& extents_) :
+     base_(base), storage_(c_storage_order()) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+ 
+     index_base_list_.assign(0);
+-    init_multi_array_ref(extents.begin());
++    init_multi_array_ref(extents_.begin());
+   }
+   
+   template <typename ExtentList>
+-  explicit const_multi_array_ref(TPtr base, const ExtentList& extents,
++  explicit const_multi_array_ref(TPtr base, const ExtentList& extents_,
+                        const general_storage_order<NumDims>& so) : 
+     base_(base), storage_(so) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+ 
+     index_base_list_.assign(0);
+-    init_multi_array_ref(extents.begin());
++    init_multi_array_ref(extents_.begin());
+   }
+   
+   explicit const_multi_array_ref(TPtr base,
 @@ -124,13 +124,13 @@
    }
    
@@ -170,17 +199,65 @@
        *out_iter++ = *in_iter++;
        copy_count++;      
      }
-@@ -327,15 +327,15 @@
+@@ -161,14 +161,14 @@
+   }
+ 
+   template <typename SizeList>
+-  void reshape(const SizeList& extents) {
++  void reshape(const SizeList& extents_) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<SizeList> >();
+     BOOST_ASSERT(num_elements_ ==
+-                 std::accumulate(extents.begin(),extents.end(),
++                 std::accumulate(extents_.begin(),extents_.end(),
+                                  size_type(1),std::multiplies<size_type>()));
+ 
+-    std::copy(extents.begin(),extents.end(),extent_list_.begin());
++    std::copy(extents_.begin(),extents_.end(),extent_list_.begin());
+     this->compute_strides(stride_list_,extent_list_,storage_);
+ 
+     origin_offset_ =
+@@ -208,11 +208,11 @@
+   }
+ 
+   template <typename IndexList>
+-  const element& operator()(IndexList indices) const {
++  const element& operator()(IndexList indices_) const {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<IndexList> >();
+     return super_type::access_element(boost::type<const element&>(),
+-                                      indices,origin(),
++                                      indices_,origin(),
+                                       shape(),strides(),index_bases());
+   }
+ 
+@@ -231,12 +231,12 @@
+ #endif // BOOST_MSVC
+   typename const_array_view<NDims>::type 
+   operator[](const detail::multi_array::
+-             index_gen<NumDims,NDims>& indices)
++             index_gen<NumDims,NDims>& indices_)
+     const {
+     typedef typename const_array_view<NDims>::type return_type;
+     return
+       super_type::generate_array_view(boost::type<return_type>(),
+-                                      indices,
++                                      indices_,
+                                       shape(),
+                                       strides(),
+                                       index_bases(),
+@@ -327,20 +327,20 @@
    explicit
    const_multi_array_ref(TPtr base,
                          const storage_order_type& so,
 -                        const index * index_bases,
 +                        const index * index_bases_,
-                         const size_type* extents) :
+-                        const size_type* extents) :
++                        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
++   // If index_bases_ or extents_ is null, then initialize the corresponding
     // private data to zeroed lists.
 -   if(index_bases) {
 +   if(index_bases_) {
@@ -190,6 +267,91 @@
     } else {
       std::fill_n(index_base_list_.begin(),NumDims,0);
     }
+-   if(extents) {
+-     init_multi_array_ref(extents);
++   if(extents_) {
++     init_multi_array_ref(extents_);
+    } else {
+      boost::array<index,NumDims> extent_list;
+      extent_list.assign(0);
+@@ -374,12 +374,12 @@
+               boost::mem_fun_ref(&extent_range::start));
+ 
+     // calculate the extents
+-    extent_list extents;
++    extent_list extents_;
+     std::transform(ranges.ranges_.begin(),ranges.ranges_.end(),
+-              extents.begin(),
++              extents_.begin(),
+               boost::mem_fun_ref(&extent_range::size));
+ 
+-    init_multi_array_ref(extents.begin());
++    init_multi_array_ref(extents_.begin());
+   }
+ 
+ 
+@@ -445,16 +445,16 @@
+   };
+ 
+   template <class ExtentList>
+-  explicit multi_array_ref(T* base, const ExtentList& extents) :
+-    super_type(base,extents) {
++  explicit multi_array_ref(T* base, const ExtentList& extents_) :
++    super_type(base,extents_) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+   }
+ 
+   template <class ExtentList>
+-  explicit multi_array_ref(T* base, const ExtentList& extents,
++  explicit multi_array_ref(T* base, const ExtentList& extents_,
+                            const general_storage_order<NumDims>& so) :
+-    super_type(base,extents,so) {
++    super_type(base,extents_,so) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+   }
+@@ -509,11 +509,11 @@
+   element* data() { return super_type::base_; }
+ 
+   template <class IndexList>
+-  element& operator()(const IndexList& indices) {
++  element& operator()(const IndexList& indices_) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<IndexList> >();
+     return super_type::access_element(boost::type<element&>(),
+-                                      indices,origin(),
++                                      indices_,origin(),
+                                       this->shape(),this->strides(),
+                                       this->index_bases());
+   }
+@@ -535,11 +535,11 @@
+ #endif // BOOST_MSVC
+   typename array_view<NDims>::type 
+   operator[](const detail::multi_array::
+-             index_gen<NumDims,NDims>& indices) {
++             index_gen<NumDims,NDims>& indices_) {
+     typedef typename array_view<NDims>::type return_type;
+     return
+       super_type::generate_array_view(boost::type<return_type>(),
+-                                      indices,
++                                      indices_,
+                                       this->shape(),
+                                       this->strides(),
+                                       this->index_bases(),
+@@ -576,10 +576,10 @@
+   const element* data() const { return super_type::data(); }
+ 
+   template <class IndexList>
+-  const element& operator()(const IndexList& indices) const {
++  const element& operator()(const IndexList& indices_) const {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<IndexList> >();
+-    return super_type::operator()(indices);
++    return super_type::operator()(indices_);
+   }
+ 
+   const_reference operator[](index idx) const {
 @@ -597,9 +597,9 @@
  #endif // BOOST_MSVC
    typename const_array_view<NDims>::type