X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.cpp;h=c4c01b21fbdf692fc92cb4fe147a4ad58b969a86;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=b5833e9ea39295fb3539ecb9aa42f506e8ed3b92;hpb=8bc8db44c47cd2906c57dccbfb589e41eff7f694;p=builder.git diff --git a/source/condition.cpp b/source/condition.cpp index b5833e9..c4c01b2 100644 --- a/source/condition.cpp +++ b/source/condition.cpp @@ -7,14 +7,12 @@ Distributed under the LGPL #include #include "condition.h" -#include "package.h" +#include "sourcepackage.h" using namespace std; using namespace Msp; -#include - -Condition::Condition(Package &p, const string &expr): +Condition::Condition(SourcePackage &p, const string &expr): pkg(p) { vector parts=split(expr); @@ -23,7 +21,7 @@ Condition::Condition(Package &p, const string &expr): { if(*i=="and") continue; - + unsigned token=i->find_first_of("=!"); if(token==string::npos) expression.insert(StringMap::value_type(*i, "!0"));