X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=5c83fd7ec18607b4e6728a6594bbb040f017d1ee;hb=93c0466ccf46aa3d43541a1aa6a75192d237b3eb;hp=1c5ca246fcf8cbcdb0ff521da013723e4a0217ad;hpb=f76c063eb9b792088e034ffb4c2f173b843e8c57;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 1c5ca24..5c83fd7 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -128,13 +128,13 @@ void SourcePackage::save_caches()
 
 
 SourcePackage::Loader::Loader(SourcePackage &p):
-	DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
 {
 	init(0);
 }
 
 SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
-	DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
 {
 	init(&o);
 }
@@ -147,7 +147,7 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
 	add("build_info",  &Loader::build_info);
 	add("feature",     &Loader::feature);
 	add("if",          &Loader::condition);
-	add("if_feat",     &Loader::if_feature);
+	add("if_feature",  &Loader::if_feature);
 	add("program",     &Loader::component<Component::PROGRAM>);
 	add("library",     &Loader::component<Component::LIBRARY>);
 	add("module",      &Loader::component<Component::MODULE>);
@@ -235,7 +235,7 @@ void SourcePackage::Loader::if_feature(const string &cond)
 	if(equals!=string::npos)
 	{
 		if(equals==0)
-			error("No feature name specified");
+			throw invalid_argument("SourcePackage::Loader::if_feature");
 		bool negate = cond[equals-1]=='!';
 		string name = cond.substr(0, equals-negate);
 		string value = obj.config.get_option("with_"+name).value;