mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-14 01:19:59 +00:00
fixed incompatibilities caused bu merge
This commit is contained in:
parent
3cbd0e0762
commit
9092c32f2e
@ -127,8 +127,6 @@ namespace
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
namespace MWWorld
|
||||
@ -287,7 +285,7 @@ namespace MWWorld
|
||||
};
|
||||
|
||||
|
||||
int ESMStore::find(const std::string& id) const
|
||||
int ESMStore::find(const std::string_view& id) const
|
||||
{
|
||||
IDMap::const_iterator it = mStoreImp->mIds.find(id);
|
||||
if (it == mStoreImp->mIds.end()) {
|
||||
|
@ -6,6 +6,8 @@
|
||||
#include <unordered_map>
|
||||
|
||||
#include <components/esm/luascripts.hpp>
|
||||
#include <components/esm/records.hpp>
|
||||
|
||||
#include "store.hpp"
|
||||
|
||||
namespace Loading
|
||||
@ -83,7 +85,7 @@ namespace MWWorld
|
||||
}
|
||||
|
||||
/// Look up the given ID in 'all'. Returns 0 if not found.
|
||||
int find(const std::string& id) const;
|
||||
int find(const std::string_view& id) const;
|
||||
|
||||
int findStatic(const std::string& id) const;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user