From de7f9f643994bc7bf1801c1678969895ae3f4866 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 16 Feb 2022 17:24:56 +0100 Subject: [PATCH] Replace raw for loop by algorithm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To fix compilation error with -D_GLIBCXX_DEBUG: /home/elsid/dev/openmw/apps/openmw/mwdialogue/dialoguemanagerimp.cpp: In member function ‘virtual void MWDialogue::DialogueManager::write(ESM::ESMWriter&, Loading::Listener&) const’: /home/elsid/dev/openmw/apps/openmw/mwdialogue/dialoguemanagerimp.cpp:679:78: error: no matching function for call to ‘__gnu_debug::_Safe_iterator >, std::__debug::set >, std::bidirectional_iterator_tag>::_Safe_iterator(std::__debug::set, Misc::StringUtils::CiComp>::const_iterator)’ 679 | for (std::set::const_iterator iter (mKnownTopics.begin()); | ^ --- apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp index 4612e2bdfd..feb3c22035 100644 --- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp +++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp @@ -676,11 +676,8 @@ namespace MWDialogue { ESM::DialogueState state; - for (std::set::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;