Use ObjectLoaders where appropriate

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 38829f758c76af4f44cde0ec1a88565b42238a22..f74b4a09bdda43e905df82ff8584009b2da0b9db 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -39,14 +39,14 @@ void Package::configure(const StringMap &opts, unsigned flag)
 
 
 Package::Loader::Loader(Package &p):
-       pkg(p)
+       DataFile::ObjectLoader<Package>(p)
 {
        add("require", &Loader::require);
 }
 
 void Package::Loader::require(const string &n)
 {
-       Package *req = pkg.builder.get_package_manager().find_package(n);
+       Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
-               pkg.requires.push_back(req);
+               obj.requires.push_back(req);
 }