mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-28 08:11:34 +00:00
Merge branch 'fix_iterator_conversion' into 'master'
Fix compilation error with -D_GLIBCXX_DEBUG See merge request OpenMW/openmw!1668
This commit is contained in:
commit
0cae7c85dd
1 changed files with 2 additions and 5 deletions
|
@ -676,11 +676,8 @@ namespace MWDialogue
|
|||
{
|
||||
ESM::DialogueState state;
|
||||
|
||||
for (std::set<std::string>::const_iterator iter (mKnownTopics.begin());
|
||||
iter!=mKnownTopics.end(); ++iter)
|
||||
{
|
||||
state.mKnownTopics.push_back (*iter);
|
||||
}
|
||||
state.mKnownTopics.reserve(mKnownTopics.size());
|
||||
std::copy(mKnownTopics.begin(), mKnownTopics.end(), std::back_inserter(state.mKnownTopics));
|
||||
|
||||
state.mChangedFactionReaction = mChangedFactionReaction;
|
||||
|
||||
|
|
Loading…
Reference in a new issue