DataFile::DerivedObjectLoader was changed

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index f00f0faf10519e7211dfd7df4a38af5bcf76eb29..22a415457e75844e52e3c8675953e3e351c8338c 100644 (file)
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -123,7 +123,7 @@ BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, c
 
 
 BinaryPackage::Loader::Loader(BinaryPackage &p):
-       DataFile::DerivedObjectLoader<BinaryPackage, Package>(p)
+       DataFile::DerivedObjectLoader<BinaryPackage, Package::Loader>(p)
 {
        add("build_info", &Loader::build_info);
        add("header",     &Loader::header);

diff --git a/source/binarypackage.h b/source/binarypackage.h
index 892718484856cfc98a3bf5102a050fd835ab7b74..13e2fd85ddc7a65397654400a9ece95913d308be 100644 (file)
--- a/source/binarypackage.h
+++ b/source/binarypackage.h
@@ -10,7 +10,7 @@ Builder.
 class BinaryPackage: public Package
 {
 public:
-       class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package>
+       class Loader: public Msp::DataFile::DerivedObjectLoader<BinaryPackage, Package::Loader>
        {
        public:
                Loader(BinaryPackage &);

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 378460d00d968422cc3f618a42baf4436953514c..6eaba739586881eac93f183eeb66ad49ce13c00a 100644 (file)
--- 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);
 }

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 0aab392308d089c2621ee0515819ea2c540a870f..97c8d61a6fb7914494c31475a8423e8954d3d66c 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -28,7 +28,7 @@ A package that can be built by Builder.
 class SourcePackage: public Package
 {
 public:
-       class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
+       class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>
        {
        private:
                const Config::InputOptions *options;