X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=6eaba739586881eac93f183eeb66ad49ce13c00a;hb=08015c0f27f377fcd4aa186fca5bd8cf70723a5a;hp=1c5ca246fcf8cbcdb0ff521da013723e4a0217ad;hpb=f76c063eb9b792088e034ffb4c2f173b843e8c57;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 1c5ca24..6eaba73 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>);