void ArchitectureConditional::if_arch(const string &cond)
{
- BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&builder.get_current_arch(), &Architecture::match_name)), false);
+ const Architecture &arch = builder.get_current_arch();
+ BooleanEvaluator eval([&arch](const string &value, const string *){ return arch.match_name(value); }, false);
bool match = eval.evaluate(cond);
builder.get_logger().log("configure", format("%s: arch %s %smatched", log_prefix, cond, (match ? "" : "not ")));
if(match)
void FeatureConditional::if_feature(const string &cond)
{
- BooleanEvaluator eval(sigc::mem_fun(&package, &SourcePackage::match_feature));
+ 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 ")));
if(match)