Use shortcut functions for find calls

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 496132f7a5266523e92777e0558aeb79b62b57cb..44255a1eb5ca692fe1fc03461cd63e4d422eca61 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/strings/format.h>
 #include "architecture.h"
 #include "builder.h"
@@ -38,12 +38,7 @@ void Tool::set_command(const string &cmd, bool cross)
 
 bool Tool::accepts_suffix(const string &suffix, bool aux) const
 {
-       if(find(input_suffixes.begin(), input_suffixes.end(), suffix)!=input_suffixes.end())
-               return true;
-       else if(aux)
-               return find(aux_suffixes.begin(), aux_suffixes.end(), suffix)!=aux_suffixes.end();
-       else
-               return false;
+       return (any_equals(input_suffixes, suffix) || (aux && any_equals(aux_suffixes, suffix)));
 }
 
 Target *Tool::create_target(Target &source, const string &arg)