dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove: replace custom span with std::span

Browse Source
This commit is contained in:
Patric Stout
2024-01-16 22:46:00 +01:00
committed by Patric Stout
parent bb49112784
commit fd073a2810
15 changed files with 22 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/strings_internal.h
View File

@@ -12,7 +12,6 @@
#include "strings_func.h"
#include "string_func.h"
#include "core/span_type.hpp"
/** The data required to format and validate a single parameter of a string. */
struct StringParameter {
@@ -25,12 +24,12 @@ struct StringParameter {
class StringParameters {
protected:
StringParameters *parent = nullptr; ///< If not nullptr, this instance references data from this parent instance.
span<StringParameter> parameters = {}; ///< Array with the actual parameters.
std::span<StringParameter> parameters = {}; ///< Array with the actual parameters.
size_t offset = 0; ///< Current offset in the parameters span.
char32_t next_type = 0; ///< The type of the next data that is retrieved.
StringParameters(span<StringParameter> parameters = {}) :
StringParameters(std::span<StringParameter> parameters = {}) :
parameters(parameters)
{}
@@ -211,7 +210,7 @@ class ArrayStringParameters : public StringParameters {
public:
ArrayStringParameters()
{
this->parameters = span(params.data(), params.size());
this->parameters = std::span(params.data(), params.size());
}
ArrayStringParameters(ArrayStringParameters&& other) noexcept
@@ -224,7 +223,7 @@ public:
this->offset = other.offset;
this->next_type = other.next_type;
this->params = std::move(other.params);
this->parameters = span(params.data(), params.size());
this->parameters = std::span(params.data(), params.size());
return *this;
}