X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbinarypackage.cpp;h=514481f0066c56a3febb253a81708d3ff51c16da;hb=30b1243ff16b908ae18b4ab9d70f772c9196b949;hp=cc90c0af4f5b26d70747938d481fd12af99bd455;hpb=ca18323d45d67243773b03668e79c715aa976441;p=builder.git

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index cc90c0a..514481f 100644
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -29,7 +29,7 @@ void BinaryPackage::create_build_info()
 			*i = path/i->subpath(1);
 }
 
-BinaryPackage *BinaryPackage::from_flags(Builder &builder, const std::string &name, const vector<string> &flags)
+BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const vector<string> &flags)
 {
 	BinaryPackage *pkg = new BinaryPackage(builder, name);
 	pkg->use_pkgconfig = true;
@@ -60,7 +60,7 @@ BinaryPackage *BinaryPackage::from_flags(Builder &builder, const std::string &na
 
 
 BinaryPackage::Loader::Loader(BinaryPackage &p):
-	Package::Loader(p)
+	DataFile::DerivedObjectLoader<BinaryPackage, Package>(p)
 {
 	add("need_path", &BinaryPackage::need_path);
 	add("build_info", &Loader::build_info);
@@ -68,5 +68,5 @@ BinaryPackage::Loader::Loader(BinaryPackage &p):
 
 void BinaryPackage::Loader::build_info()
 {
-	load_sub(static_cast<BinaryPackage &>(pkg).export_binfo);
+	load_sub(obj.export_binfo);
 }