From 653aa32eb2ff95281988d8eba068462a870d4388 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 13 Nov 2012 05:52:24 -0800 Subject: [PATCH] Use std::any_of rather than std::find_if() != end() --- aegisub/src/auto4_base.cpp | 4 ++-- aegisub/src/command/edit.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp index a9ff3bebc..1d0452408 100644 --- a/aegisub/src/auto4_base.cpp +++ b/aegisub/src/auto4_base.cpp @@ -570,8 +570,8 @@ namespace Automation4 { { using std::placeholders::_1; // Just make this always return true to bitch about unknown script formats in autoload - return find_if(Factories().begin(), Factories().end(), - [&](ScriptFactory *sf) { return filename.Matches(sf->GetFilenamePattern()); }) != Factories().end(); + return any_of(Factories().begin(), Factories().end(), + [&](ScriptFactory *sf) { return filename.Matches(sf->GetFilenamePattern()); }); } std::vector& ScriptFactory::Factories() diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp index 5085eb21a..4b02bce32 100644 --- a/aegisub/src/command/edit.cpp +++ b/aegisub/src/command/edit.cpp @@ -612,7 +612,7 @@ static void duplicate_lines(agi::Context *c, bool shift) { if (start == end) break; // And the last line in this contiguous selection - entryIter insert_pos = find_if(start, end, std::not1(sel)); + entryIter insert_pos = find_if_not(start, end, sel); entryIter last = insert_pos; --last;