Use ObjectLoaders where appropriate

[builder.git] / source / binarypackage.cpp

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index b9c558eff44f96a9dcb4f21c0d80c9da8af19036..514481f0066c56a3febb253a81708d3ff51c16da 100644 (file)
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -60,7 +60,7 @@ BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, c
 
 
 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);
 }