Move the Component reference to Target and make it a pointer

[builder.git] / source / gnuarchiver.cpp

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 8eab751e7ad405faf49951bff4f763fd003303d6..d75c627519694b03207847d3b0c671324c042546 100644 (file)
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -42,7 +42,7 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
 Task *GnuArchiver::run(const Target &target) const
 {
        const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
-       const Component &comp = lib.get_component();
+       const Component &comp = *lib.get_component();
 
        vector<string> argv;
        argv.push_back("ar");
@@ -52,8 +52,8 @@ Task *GnuArchiver::run(const Target &target) const
 
        argv.push_back(relative(lib.get_path(), work_dir).str());
 
-       const TargetList &deps = lib.get_depends();
-       for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+       const Target::Dependencies &deps = lib.get_depends();
+       for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
                if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
                        argv.push_back(relative(obj->get_path(), work_dir).str());