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 /comphelper/source | |
| 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 'comphelper/source')
| -rw-r--r-- | comphelper/source/misc/simplefileaccessinteraction.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/stillreadwriteinteraction.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/property/propertysetinfo.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/comphelper/source/misc/simplefileaccessinteraction.cxx b/comphelper/source/misc/simplefileaccessinteraction.cxx index f7a4f0eab237..15029a1230e0 100644 --- a/comphelper/source/misc/simplefileaccessinteraction.cxx +++ b/comphelper/source/misc/simplefileaccessinteraction.cxx @@ -29,7 +29,7 @@ const sal_Int32 HANDLE_CERTIFICATEREQUEST = 3; /// Will handle com::sun::star::ucb::AuthenticationRequest const sal_Int32 HANDLE_AUTHENTICATIONREQUEST = 4; -static o3tl::span<const ::ucbhelper::InterceptedInteraction::InterceptedRequest> getInterceptions() +static std::span<const ::ucbhelper::InterceptedInteraction::InterceptedRequest> getInterceptions() { static const ::ucbhelper::InterceptedInteraction::InterceptedRequest lInterceptions[]{ { //intercept standard IO error exception (local file and WebDAV) diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index a6d1db057745..191b751f978d 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -39,7 +39,7 @@ const sal_Int32 HANDLE_UNSUPPORTEDDATASINKEXCEPTION = 1; const sal_Int32 HANDLE_AUTHENTICATIONREQUESTEXCEPTION = 2; const sal_Int32 HANDLE_CERTIFICATEVALIDATIONREQUESTEXCEPTION = 3; -static o3tl::span<const ::ucbhelper::InterceptedInteraction::InterceptedRequest> getInterceptions() +static std::span<const ::ucbhelper::InterceptedInteraction::InterceptedRequest> getInterceptions() { static const ::ucbhelper::InterceptedInteraction::InterceptedRequest lInterceptions[] { { diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 206129c5f595..d288ae21263f 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -32,7 +32,7 @@ PropertySetInfo::PropertySetInfo() noexcept { } -PropertySetInfo::PropertySetInfo( o3tl::span<const PropertyMapEntry> pMap ) noexcept +PropertySetInfo::PropertySetInfo( std::span<const PropertyMapEntry> pMap ) noexcept { maPropertyMap.reserve(pMap.size()); for (const auto & rEntry : pMap) @@ -51,7 +51,7 @@ PropertySetInfo::~PropertySetInfo() noexcept { } -void PropertySetInfo::add( o3tl::span<PropertyMapEntry const> pMap ) noexcept +void PropertySetInfo::add( std::span<PropertyMapEntry const> pMap ) noexcept { maPropertyMap.reserve(maPropertyMap.size() + pMap.size()); for (const auto & rEntry : pMap) |