zip elements range

Author: alfC

include/boost/multi/array_ref.hpp

@@ -1104,7 +1104,7 @@ struct elements_range_t {
 	constexpr auto is_empty() const -> bool { return l_.is_empty(); }
 
 	elements_range_t(elements_range_t const&) = delete;
-	elements_range_t(elements_range_t&&)      = delete;
+	elements_range_t(elements_range_t&&)      = default;
 
 	template<class Range> auto operator==(Range const& other) const -> bool {
 		return size() == other.size() && adl_equal(other.begin(), other.end(), begin());
@@ -4320,9 +4320,11 @@ template<typename Element, ::boost::multi::dimensionality_type D, class... Rest>
 template<typename Element, ::boost::multi::dimensionality_type D, class... Rest>
 [[maybe_unused]] constexpr bool enable_borrowed_range<::boost::multi::const_subarray<Element, D, Rest...>> = true;  // NOLINT(misc-definitions-in-headers)
 
-
 template<typename Element, ::boost::multi::dimensionality_type D, class... Rest>
 [[maybe_unused]] constexpr bool enable_borrowed_range<::boost::multi::array_ref<Element, D, Rest...>> = true;  // NOLINT(misc-definitions-in-headers)
+
+template<typename Ptr, class... Rest>
+[[maybe_unused]] constexpr bool enable_borrowed_range<::boost::multi::elements_range_t<Ptr, Rest...>> = true;  // NOLINT(misc-definitions-in-headers)
 }  // end namespace std::ranges
 #endif
 

test/ranges_zip.cpp

@@ -24,63 +24,74 @@ auto main() -> int {  // NOLINT(bugprone-exception-escape)
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-        auto zp = std::views::zip(arr1, arr2);
+		auto zp = std::views::zip(arr1, arr2);
 
-        auto [e1, e2] = zp[3];
+		auto [e1, e2] = zp[3];
 
-        BOOST_TEST( e1 == 5 );
-        BOOST_TEST( e2 == 6 );
-    }
-    {
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-        auto es1 = arr1.elements();
-        auto es2 = arr2.elements();
+		auto es1 = arr1.elements();
+		auto es2 = arr2.elements();
 
-        auto zp = std::views::zip(arr1, arr2);
+		auto zp = std::views::zip(arr1, arr2);
 
-        auto [e1, e2] = zp[3];
+		auto [e1, e2] = zp[3];
 
-        BOOST_TEST( e1 == 5 );
-        BOOST_TEST( e2 == 6 );
-    }
-    {
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-        auto zp = std::views::zip(arr1.elements(), arr2.elements());
+		auto zp = std::views::zip(arr1.elements(), arr2.elements());
 
-        auto [e1, e2] = zp[3];
+		auto [e1, e2] = zp[3];
 
-        BOOST_TEST( e1 == 5 );
-        BOOST_TEST( e2 == 6 ); 
-    }
-    {
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-        auto zp = std::views::zip(arr1(), arr2());
+		auto zp = std::views::zip(arr1(), arr2());
 
-        auto [e1, e2] = zp[3];
+		auto [e1, e2] = zp[3];
 
-        BOOST_TEST( e1 == 5 );
-        BOOST_TEST( e2 == 6 );
-    }
-    {
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-        auto es1 = arr1().elements();
-        auto es2 = arr2().elements();
+		auto es1 = arr1().elements();
+		auto es2 = arr2().elements();
+
+		auto zp = std::views::zip(arr1, arr2);
+
+		auto [e1, e2] = zp[3];
+
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
+		multi::array<int, 1> arr1({10}, 5);
+		multi::array<int, 1> arr2({10}, 6);
 
-        auto zp = std::views::zip(arr1, arr2);
+		auto zp = std::views::zip(arr1().elements(), arr2().elements());
 
-        auto [e1, e2] = zp[3];
+		auto [e1, e2] = zp[3];
 
-        BOOST_TEST( e1 == 5 );
-        BOOST_TEST( e2 == 6 );
-    }
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
 #endif
 
 	return boost::report_errors();