diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-11 13:27:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-11 21:53:13 +0200 |
| commit | 6d1b241ab7b2edf3f3eef26f4cc514c22849caf5 (patch) | |
| tree | 3c8c3b278b5fe084434b0bee682575d4a41c0adb /o3tl | |
| parent | 432e34fd1e0309038d0765f2497b7925c16a8ed2 (diff) | |
Drop o3tl::span, can use C++20 std::span directly now
Change-Id: Ic21ff7bf48f07f7277979d52e99d2c5c268de83f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157825
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'o3tl')
| -rw-r--r-- | o3tl/CppunitTest_o3tl_tests.mk | 1 | ||||
| -rw-r--r-- | o3tl/qa/test-span.cxx | 60 |
2 files changed, 0 insertions, 61 deletions
diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 1cbb1c86bd91..4f7ab02b1da1 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ o3tl/qa/test-lru_map \ o3tl/qa/test-safeint \ o3tl/qa/test-sorted_vector \ - o3tl/qa/test-span \ o3tl/qa/test-string_view \ o3tl/qa/test-temporary \ o3tl/qa/test-typed_flags \ diff --git a/o3tl/qa/test-span.cxx b/o3tl/qa/test-span.cxx deleted file mode 100644 index 26eedfc21938..000000000000 --- a/o3tl/qa/test-span.cxx +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include <sal/config.h> - -#include <cstddef> -#include <utility> - -#include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> -#include <cppunit/extensions/HelperMacros.h> - -#include <o3tl/span.hxx> - -namespace { - -class Test: public CppUnit::TestFixture { -private: - CPPUNIT_TEST_SUITE(Test); - CPPUNIT_TEST(testOperations); - CPPUNIT_TEST_SUITE_END(); - - - void testOperations() { - int const some_data[] { 1, 2, 3 }; - o3tl::span<int const> v(some_data); - - CPPUNIT_ASSERT_EQUAL(1, *v.begin()); - CPPUNIT_ASSERT_EQUAL( - o3tl::span<int>::difference_type(3), v.end() - v.begin()); - CPPUNIT_ASSERT_EQUAL(3, *v.rbegin()); - CPPUNIT_ASSERT_EQUAL( - o3tl::span<int>::difference_type(3), v.rend() - v.rbegin()); - CPPUNIT_ASSERT_EQUAL(std::size_t(3), v.size()); - CPPUNIT_ASSERT(!v.empty()); - CPPUNIT_ASSERT_EQUAL(2, v[1]); - CPPUNIT_ASSERT_EQUAL(1, *v.data()); - { - int const d1[] { 1, 2 }; - int const d2[] { 3, 4, 5, 6 }; - o3tl::span<int const> v1( d1 ); - o3tl::span<int const> v2( d2 ); - std::swap(v1, v2); - CPPUNIT_ASSERT_EQUAL(std::size_t(4), v1.size()); - CPPUNIT_ASSERT_EQUAL(std::size_t(2), v2.size()); - } - } -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(Test); - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |