summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-23 18:41:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-11-26 09:34:51 +0000
commit0789a8ef9176b1f84b61d9d7bd9556395a21b8c8 (patch)
tree09ebb0f53bd239a8c3a136b840666de3a8a388ac /boost
parente54dc7b8a4823db1050a11ec72f814bbecd3ba4a (diff)
WaE: some additional warnings
Change-Id: I6a86661dfceb4ecaeadb4fb045e924f2b65e1ad2
Diffstat (limited to 'boost')
-rw-r--r--boost/boost.6397.warnings.patch19
1 files changed, 16 insertions, 3 deletions
diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
index e2e52ff85c24..d41df08104cf 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -169,15 +169,28 @@
} else {
std::fill_n(index_base_list_.begin(),NumDims,0);
}
+@@ -597,9 +597,9 @@
+ #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 {
+- return super_type::operator[](indices);
++ return super_type::operator[](indices_);
+ }
+
+ const_iterator begin() const {
@@ -622,9 +622,9 @@
// This is only supplied to support multi_array's default constructor
explicit multi_array_ref(T* base,
const storage_order_type& so,
- const index* index_bases,
-+ const index* index_bases_,
- const size_type* extents) :
+- const size_type* extents) :
- super_type(base,so,index_bases,extents) { }
-+ super_type(base,so,index_bases_,extents) { }
++ const index* index_bases_,
++ const size_type* extents_) :
++ super_type(base,so,index_bases_,extents_) { }
};