Use default member initializers and constructor delegation

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index 377dc7f4bc0813ae095ede177bbaf004512244de..5d0903a2e3c4eb44902ccd9d178c5aa207655e6a 100644 (file)
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -10,21 +10,17 @@ using namespace std;
 using namespace Msp;
 
 Tool::Tool(Builder &b, const string &t):
-       builder(b),
-       architecture(0),
-       tag(t),
-       executable(0),
-       processing_unit(ONE_FILE),
-       prepared(false)
+       Tool(b, 0, t)
 { }
 
 Tool::Tool(Builder &b, const Architecture &a, const string &t):
+       Tool(b, &a, t)
+{ }
+
+Tool::Tool(Builder &b, const Architecture *a, const string &t):
        builder(b),
-       architecture(&a),
-       tag(t),
-       executable(0),
-       processing_unit(ONE_FILE),
-       prepared(false)
+       architecture(a),
+       tag(t)
 { }
 
 void Tool::set_command(const string &cmd, bool cross)
@@ -45,7 +41,7 @@ bool Tool::accepts_suffix(const string &suffix, bool aux) const
 
 Target *Tool::create_target(Target &source, const string &arg)
 {
-       list<Target *> sources;
+       vector<Target *> sources;
        sources.push_back(&source);
        return create_target(sources, arg);
 }
@@ -62,7 +58,7 @@ void Tool::prepare()
                executable = builder.get_vfs().find_binary(command);
                if(!executable)
                {
-                       builder.get_logger().log("problems", format("Can't find executable %s for %s", command, tag));
+                       builder.get_logger().log("problems", "Can't find executable %s for %s", command, tag);
                        problems.push_back(format("Can't find executable %s", command));
                }
        }
@@ -92,7 +88,7 @@ Target *SubTool::create_source(const FS::Path &p) const
        return parent.create_source(p);
 }
 
-Target *SubTool::create_target(const list<Target *> &s, const string &a)
+Target *SubTool::create_target(const vector<Target *> &s, const string &a)
 {
        return parent.create_target(s, a);
 }