X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fconditionalloader.cpp;h=b9d9d25cbbd39bd1dbd6ac039c4228fdb8460c2e;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=731c5594c312a1d9cd18cd985c325f7806f1bc96;hpb=c5169863e1ec3060d3bdc3b8c0317710ce8c3ee3;p=builder.git diff --git a/source/conditionalloader.cpp b/source/conditionalloader.cpp index 731c559..b9d9d25 100644 --- a/source/conditionalloader.cpp +++ b/source/conditionalloader.cpp @@ -1,4 +1,3 @@ -#include #include "booleanevaluator.h" #include "builder.h" #include "conditionalloader.h" @@ -17,9 +16,9 @@ ArchitectureConditional::ArchitectureConditional(const Builder &b, const string void ArchitectureConditional::if_arch(const string &cond) { const Architecture &arch = builder.get_current_arch(); - BooleanEvaluator eval([&arch](const string &value, const string *){ return arch.match_name(value); }, false); + BooleanEvaluator eval([&arch](const string &value){ return arch.match_name(value); }); bool match = eval.evaluate(cond); - builder.get_logger().log("configure", format("%s: arch %s %smatched", log_prefix, cond, (match ? "" : "not "))); + builder.get_logger().log("configure", "%s: arch %s %smatched", log_prefix, cond, (match ? "" : "not ")); if(match) load_sub_with(*this); } @@ -36,7 +35,7 @@ void FeatureConditional::if_feature(const string &cond) { BooleanEvaluator eval([this](const string &feat, const string *value){ return package.match_feature(feat, value); }); bool match = eval.evaluate(cond); - package.get_builder().get_logger().log("configure", format("%s: feature %s %smatched", log_prefix, cond, (match ? "" : "not "))); + package.get_builder().get_logger().log("configure", "%s: feature %s %smatched", log_prefix, cond, (match ? "" : "not ")); if(match) load_sub_with(*this); }