X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconditionalloader.cpp;h=b9d9d25cbbd39bd1dbd6ac039c4228fdb8460c2e;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=623343549f842100df978091b65f711ddc87aac5;hpb=82c7d6187fdaeaa1b9cfbd6637d9b047a78f17ec;p=builder.git diff --git a/source/conditionalloader.cpp b/source/conditionalloader.cpp index 6233435..b9d9d25 100644 --- a/source/conditionalloader.cpp +++ b/source/conditionalloader.cpp @@ -1,4 +1,3 @@ -#include #include "booleanevaluator.h" #include "builder.h" #include "conditionalloader.h" @@ -19,7 +18,7 @@ void ArchitectureConditional::if_arch(const string &cond) const Architecture &arch = builder.get_current_arch(); 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); }