mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 18:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_iterator_conversion' into 'master'

Browse Source 
Fix compilation error with -D_GLIBCXX_DEBUG

See merge request OpenMW/openmw!1668
This commit is contained in:
psi29a 2022-02-17 09:16:07 +00:00
commit 0cae7c85dd
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View File

@ -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;