From aaeb90436c1a09ffd5b5bb5bfecb171566172240 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 22 Mar 2019 17:13:37 -0400 Subject: [PATCH] Actually, function operator comma order is impl defined, use erase remove --- indra/newview/llgesturemgr.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 294c683fa..ae5bded83 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -1215,9 +1215,7 @@ void LLGestureMgr::stopGesture(LLMultiGesture* gesture) gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_STOP); } - for (auto end = mPlaying.end(), it = std::find(mPlaying.begin(), end, gesture); - it != end; - it = std::find(mPlaying.erase(it), end = mPlaying.end(), gesture)); + mPlaying.erase(std::remove(mPlaying.begin(), mPlaying.end(), gesture), mPlaying.end()); gesture->reset();