X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.cpp;fp=source%2Fcondition.cpp;h=413870e6cb20ab069374aa8781a5e7738f6cad2e;hb=f76c063eb9b792088e034ffb4c2f173b843e8c57;hp=13861ba5aea01a8ad0466c44b3991094ad50f94d;hpb=f4c02ca3b4d7b2bec9bbbc86fea5fecbb4a22099;p=builder.git

diff --git a/source/condition.cpp b/source/condition.cpp
index 13861ba..413870e 100644
--- a/source/condition.cpp
+++ b/source/condition.cpp
@@ -18,11 +18,11 @@ Condition::Condition(SourcePackage &p, const string &expr):
 
 		string::size_type token = i->find_first_of("=!");
 		if(token==string::npos)
-			expression.insert(StringMap::value_type(*i, "="));
+			expression.insert(Expression::value_type(*i, "="));
 		else if(token==0 && (*i)[0]=='!')
-			expression.insert(StringMap::value_type(i->substr(1), "!"));
+			expression.insert(Expression::value_type(i->substr(1), "!"));
 		else
-			expression.insert(StringMap::value_type(i->substr(0, token), i->substr(token)));
+			expression.insert(Expression::value_type(i->substr(0, token), i->substr(token)));
 	}
 }
 
@@ -31,7 +31,7 @@ bool Condition::eval()
 	const Config &conf = pkg.get_config();
 
 	bool result = true;
-	for(StringMap::iterator i=expression.begin(); i!=expression.end(); ++i)
+	for(Expression::iterator i=expression.begin(); i!=expression.end(); ++i)
 	{
 		bool neg = (i->second[0]=='!');
 		unsigned start = 1;