From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 21 Aug 2012 23:18:15 +0000 (+0300)
Subject: DataFile::DerivedObjectLoader was changed
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=08015c0f27f377fcd4aa186fca5bd8cf70723a5a;p=builder.git

DataFile::DerivedObjectLoader was changed
---

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index f00f0fa..22a4154 100644
--- 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 8927184..13e2fd8 100644
--- 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 378460d..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);
 }
diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 0aab392..97c8d61 100644
--- 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;