Skip to content

Commit ef628e5

Browse files
committed
Merge branch 'more-doc-origin' into 'develop'
more doc origin See merge request correaa/boost-multi!1984
2 parents 39cd028 + 47a6224 commit ef628e5

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

include/boost/multi/array_ref.hpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,19 +342,19 @@ struct array_types : private Layout { // cppcheck-suppress syntaxError ; false
342342
/// Returns the base const-pointer of the array (arithmetic base of the layout, generally the first element)
343343
BOOST_MULTI_HD constexpr auto cbase() const -> element_const_ptr { return base_; }
344344

345-
/// Returns the base move-pointer of the array (arithmetic base of the layout, generally the first element)
346-
BOOST_MULTI_HD constexpr auto mbase() const& -> element_ptr& { return base_; }
345+
// /// returns the base move-pointer of the array (arithmetic base of the layout, generally the first element).
346+
// BOOST_MULTI_HD constexpr auto mbase() const& -> element_ptr& { return base_; }
347347

348348
BOOST_MULTI_HD constexpr auto layout() const -> layout_type const& { return *this; }
349-
friend constexpr auto layout(array_types const& self) -> layout_type const& { return self.layout(); }
349+
// friend constexpr auto layout(array_types const& self) -> layout_type const& { return self.layout(); }
350350

351351
BOOST_MULTI_IGNORED_UNSAFE_BUFFER_USAGE_PUSH()
352352
// [[clang::unsafe_buffer_usage]]
353353
// cppcheck-suppress duplInheritedMember ; to overwrite
354-
constexpr auto origin() const& -> decltype(auto) { return base_ + Layout::origin(); } // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
354+
[[deprecated("for compatibility with BMA")]] constexpr auto origin() const& -> decltype(auto) { return base_ + Layout::origin(); } // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
355355
BOOST_MULTI_IGNORED_UNSAFE_BUFFER_USAGE_POP()
356356

357-
friend constexpr auto origin(array_types const& self) -> decltype(auto) { return self.origin(); }
357+
// friend constexpr auto origin(array_types const& self) -> decltype(auto) { return self.origin(); }
358358

359359
protected:
360360
#ifdef _MSC_VER
@@ -2240,7 +2240,9 @@ class subarray : public const_subarray<T, D, ElementPtr, Layout> {
22402240
// cppcheck-suppress duplInheritedMember ; to overwrite
22412241
BOOST_MULTI_HD constexpr auto end() & noexcept { return this->end_aux_(); }
22422242

2243+
/// returns an move-iterator (moves on dereference) to the beginning in the leading dimension
22432244
BOOST_MULTI_HD constexpr auto mbegin() { return move_iterator{this->begin()}; }
2245+
/// returns an move-iterator (moves on dereference) to the ending in the leading dimension
22442246
BOOST_MULTI_HD constexpr auto mend() { return move_iterator{this->end()}; }
22452247

22462248
using const_subarray<T, D, ElementPtr, Layout>::home;

0 commit comments

Comments
 (0)