diff options
| author | robot-contrib <[email protected]> | 2026-05-19 23:46:09 +0300 |
|---|---|---|
| committer | robot-contrib <[email protected]> | 2026-05-20 00:04:35 +0300 |
| commit | b5d687b49f0ccef23e3bdf6ac4944fa1738dd412 (patch) | |
| tree | 3b17c2bbf1b42526dd1000ee69b5777c5a07a1b5 /contrib/restricted/boost/multi_array/include | |
| parent | 91f61f898edb3a3deaf79ed491ef5dbd29813761 (diff) | |
Update contrib/restricted/boost/multi_array to 1.91.0
commit_hash:fd2129dcfa09129d4687254c06bb378e602e2eb0
Diffstat (limited to 'contrib/restricted/boost/multi_array/include')
4 files changed, 21 insertions, 18 deletions
diff --git a/contrib/restricted/boost/multi_array/include/boost/multi_array/iterator.hpp b/contrib/restricted/boost/multi_array/include/boost/multi_array/iterator.hpp index ec5e61ce6c7..8cb09dccd40 100644 --- a/contrib/restricted/boost/multi_array/include/boost/multi_array/iterator.hpp +++ b/contrib/restricted/boost/multi_array/include/boost/multi_array/iterator.hpp @@ -1,6 +1,6 @@ // Copyright 2002 The Trustees of Indiana University. -// Use, modification and distribution is subject to the Boost Software +// Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -18,8 +18,11 @@ // multi-dimensional array class // -#include "boost/multi_array/base.hpp" -#include "boost/iterator/iterator_facade.hpp" +#include <boost/multi_array/base.hpp> +#include <boost/type.hpp> +#include <boost/iterator/iterator_facade.hpp> +#include <boost/iterator/iterator_categories.hpp> +#include <boost/iterator/enable_if_convertible.hpp> #include <algorithm> #include <cstddef> #include <iterator> @@ -51,7 +54,7 @@ template <typename T, typename TPtr, typename NumDims, typename Reference, typename IteratorCategory> class array_iterator : public - iterator_facade< + iterators::iterator_facade< array_iterator<T,TPtr,NumDims,Reference,IteratorCategory> , typename associated_types<T,NumDims>::value_type , IteratorCategory @@ -60,13 +63,13 @@ class array_iterator , private value_accessor_generator<T,NumDims>::type { - friend class ::boost::iterator_core_access; + friend class ::boost::iterators::iterator_core_access; typedef detail::multi_array::associated_types<T,NumDims> access_t; - typedef iterator_facade< + typedef iterators::iterator_facade< array_iterator<T,TPtr,NumDims,Reference,IteratorCategory> , typename detail::multi_array::associated_types<T,NumDims>::value_type - , boost::random_access_traversal_tag + , boost::iterators::random_access_traversal_tag , Reference > facade_type; @@ -78,14 +81,14 @@ class array_iterator friend class array_iterator; #else public: -#endif +#endif index idx_; TPtr base_; const size_type* extents_; const index* strides_; const index* index_base_; - + public: // Typedefs to circumvent ambiguities between parent classes typedef typename facade_type::reference reference; @@ -103,7 +106,7 @@ public: template <typename OPtr, typename ORef, typename Cat> array_iterator( const array_iterator<T,OPtr,NumDims,ORef,Cat>& rhs - , typename boost::enable_if_convertible<OPtr,TPtr>::type* = 0 + , typename boost::iterators::enable_if_convertible<OPtr,TPtr>::type* = 0 ) : idx_(rhs.idx_), base_(rhs.base_), extents_(rhs.extents_), strides_(rhs.strides_), index_base_(rhs.index_base_) { } @@ -115,7 +118,7 @@ public: { return operator_arrow_proxy<reference>(this->dereference()); } - + reference dereference() const { @@ -127,7 +130,7 @@ public: strides_, index_base_); } - + void increment() { ++idx_; } void decrement() { --idx_; } diff --git a/contrib/restricted/boost/multi_array/include/boost/multi_array/multi_array_ref.hpp b/contrib/restricted/boost/multi_array/include/boost/multi_array/multi_array_ref.hpp index 98c10c0f40e..4b076b8bf5c 100644 --- a/contrib/restricted/boost/multi_array/include/boost/multi_array/multi_array_ref.hpp +++ b/contrib/restricted/boost/multi_array/include/boost/multi_array/multi_array_ref.hpp @@ -103,7 +103,7 @@ public: boost::function_requires< CollectionConcept<ExtentList> >(); - index_base_list_.assign(0); + index_base_list_.fill(0); init_multi_array_ref(extents.begin()); } @@ -340,7 +340,7 @@ public: init_multi_array_ref(extents); } else { boost::array<index,NumDims> extent_list; - extent_list.assign(0); + extent_list.fill(0); init_multi_array_ref(extent_list.begin()); } } diff --git a/contrib/restricted/boost/multi_array/include/boost/multi_array/storage_order.hpp b/contrib/restricted/boost/multi_array/include/boost/multi_array/storage_order.hpp index 5ede677e971..314eb72ba81 100644 --- a/contrib/restricted/boost/multi_array/include/boost/multi_array/storage_order.hpp +++ b/contrib/restricted/boost/multi_array/include/boost/multi_array/storage_order.hpp @@ -48,14 +48,14 @@ namespace boost { for (size_type i=0; i != NumDims; ++i) { ordering_[i] = NumDims - 1 - i; } - ascending_.assign(true); + ascending_.fill(true); } general_storage_order(const fortran_storage_order&) { for (size_type i=0; i != NumDims; ++i) { ordering_[i] = i; } - ascending_.assign(true); + ascending_.fill(true); } size_type ordering(size_type dim) const { return ordering_[dim]; } diff --git a/contrib/restricted/boost/multi_array/include/boost/multi_array/view.hpp b/contrib/restricted/boost/multi_array/include/boost/multi_array/view.hpp index e6379118576..cae5a005f71 100644 --- a/contrib/restricted/boost/multi_array/include/boost/multi_array/view.hpp +++ b/contrib/restricted/boost/multi_array/include/boost/multi_array/view.hpp @@ -90,7 +90,7 @@ public: } void reindex(index value) { - index_base_list_.assign(value); + index_base_list_.fill(value); origin_offset_ = this->calculate_indexing_offset(stride_list_,index_base_list_); } @@ -231,7 +231,7 @@ public: // should be protected const boost::array<Index,NumDims>& strides): base_(base), origin_offset_(0) { - index_base_list_.assign(0); + index_base_list_.fill(0); // Get the extents and strides boost::detail::multi_array:: |
