From 6229fc671b90ccceaf01067c92f08127f72d0f42 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 22 Feb 2020 17:29:15 +0100 Subject: Adapt o3tl::span to removal of std::span::cbegin et al MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "span::cbegin/cend methods produce different results than std::[ranges::]cbegin/cend", as implemented now in "libstdc++: Remove std::span::cbegin and std::span::cend (LWG 3320)". Turns out we only used the removed member functions in o3tl/qa/test-span.cxx. Change-Id: I6c73797594b4e0e753a88840033d54961e271df5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89261 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90634 Reviewed-by: Caolán McNamara --- o3tl/qa/test-span.cxx | 6 ------ 1 file changed, 6 deletions(-) (limited to 'o3tl/qa') diff --git a/o3tl/qa/test-span.cxx b/o3tl/qa/test-span.cxx index 3cb78ace1db2..26eedfc21938 100644 --- a/o3tl/qa/test-span.cxx +++ b/o3tl/qa/test-span.cxx @@ -34,15 +34,9 @@ private: CPPUNIT_ASSERT_EQUAL(1, *v.begin()); CPPUNIT_ASSERT_EQUAL( o3tl::span::difference_type(3), v.end() - v.begin()); - CPPUNIT_ASSERT_EQUAL(1, *v.cbegin()); - CPPUNIT_ASSERT_EQUAL( - o3tl::span::difference_type(3), v.cend() - v.cbegin()); CPPUNIT_ASSERT_EQUAL(3, *v.rbegin()); CPPUNIT_ASSERT_EQUAL( o3tl::span::difference_type(3), v.rend() - v.rbegin()); - CPPUNIT_ASSERT_EQUAL(3, *v.crbegin()); - CPPUNIT_ASSERT_EQUAL( - o3tl::span::difference_type(3), v.crend() - v.crbegin()); CPPUNIT_ASSERT_EQUAL(std::size_t(3), v.size()); CPPUNIT_ASSERT(!v.empty()); CPPUNIT_ASSERT_EQUAL(2, v[1]); -- cgit