mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-17 10:10:23 +00:00
Code Issues Projects Releases Wiki Activity

Retain the use of std::string_view in the function signature.

Browse Source
This commit is contained in:
cc9cii 2021-08-04 08:23:22 +10:00
parent 99e691fbe3
commit bf06898a79
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/opencs/model/world/refcollection.cpp
View File

@ -181,14 +181,14 @@ std::string CSMWorld::RefCollection::getNewId()
return "ref#" + std::to_string(mNextId++);
}
unsigned int CSMWorld::RefCollection::extractIdNum (const std::string& id) const
unsigned int CSMWorld::RefCollection::extractIdNum(std::string_view id) const
{
std::string::size_type separator = id.find_last_of('#');
if (separator == std::string::npos)
throw std::runtime_error("invalid ref ID: " + id);
throw std::runtime_error("invalid ref ID: " + std::string(id));
return static_cast<unsigned int>(std::stoi(id.substr(separator+1)));
return static_cast<unsigned int>(std::stoi(std::string(id.substr(separator+1))));
}
int CSMWorld::RefCollection::getIntIndex (unsigned int id) const

2
apps/opencs/model/world/refcollection.hpp
View File

@ -29,7 +29,7 @@ namespace CSMWorld
int mNextId;
unsigned int extractIdNum(const std::string& id) const;
unsigned int extractIdNum(std::string_view id) const;
int getIntIndex (unsigned int id) const;