From 401f765462f87cf0ab4d80be2526fc8964a299e5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 1 Sep 2015 16:54:40 -0400 Subject: [PATCH] FramebufferManagerBase: Compress a loop into a find_if --- .../Core/VideoCommon/FramebufferManagerBase.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index 1b9fb40410..7981dfce4d 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. - +#include #include "VideoCommon/FramebufferManagerBase.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" @@ -182,17 +182,12 @@ FramebufferManagerBase::VirtualXFBListType::iterator FramebufferManagerBase::Fin const u32 srcLower = xfbAddr; const u32 srcUpper = xfbAddr + 2 * width * height; - VirtualXFBListType::iterator it = m_virtualXFBList.begin(); - for (; it != m_virtualXFBList.end(); ++it) - { - const u32 dstLower = it->xfbAddr; - const u32 dstUpper = it->xfbAddr + 2 * it->xfbWidth * it->xfbHeight; + return std::find_if(m_virtualXFBList.begin(), m_virtualXFBList.end(), [srcLower, srcUpper](const VirtualXFB& xfb) { + const u32 dstLower = xfb.xfbAddr; + const u32 dstUpper = xfb.xfbAddr + 2 * xfb.xfbWidth * xfb.xfbHeight; - if (dstLower >= srcLower && dstUpper <= srcUpper) - break; - } - - return it; + return dstLower >= srcLower && dstUpper <= srcUpper; + }); } void FramebufferManagerBase::ReplaceVirtualXFB()