mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 20:36:40 +00:00
Code Issues 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++); 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('#'); std::string::size_type separator = id.find_last_of('#');
if (separator == std::string::npos) 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 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; int mNextId;
unsigned int extractIdNum(const std::string& id) const; unsigned int extractIdNum(std::string_view id) const;
int getIntIndex (unsigned int id) const; int getIntIndex (unsigned int id) const;