oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Introduce std::string_view into wider use (#14368)

Browse source
This commit is contained in:
sfan5 2024-02-17 15:35:33 +01:00 • committed by GitHub
parent fa47af737f
commit 6ca214fefc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
74 changed files with 501 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/metadata.cpp
View file

@ -70,7 +70,7 @@ bool IMetadata::getStringToRef(const std::string &name,
const std::string &IMetadata::resolveString(const std::string &str, std::string *place,
u16 recursion, bool deprecated) const
{
if (recursion <= 1 && str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
if (recursion <= 1 && str_starts_with(str, "${") && str.back() == '}') {
if (deprecated) {
warningstream << "Deprecated use of recursive resolution syntax in metadata: ";
safe_print_string(warningstream, str);
@ -128,7 +128,7 @@ const std::string *SimpleMetadata::getStringRaw(const std::string &name, std::st
return found != m_stringvars.cend() ? &found->second : nullptr;
}
bool SimpleMetadata::setString(const std::string &name, const std::string &var)
bool SimpleMetadata::setString(const std::string &name, std::string_view var)
{
if (var.empty()) {
if (m_stringvars.erase(name) == 0)
@ -137,7 +137,7 @@ bool SimpleMetadata::setString(const std::string &name, const std::string &var)
StringMap::iterator it = m_stringvars.find(name);
if (it != m_stringvars.end() && it->second == var)
return false;
m_stringvars[name] = var;
m_stringvars[name].assign(var);
}
m_modified = true;
return true;