Use default member initializers and constructor delegation

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 49a769371739044f8ae3200198273979391c15ad..d701859524b19ef662e8e6178ef352a011c2e7cb 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,7 +1,6 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/strings/format.h>
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
@@ -14,12 +13,7 @@ using namespace Msp;
 
 Target::Target(Builder &b, const string &n):
        builder(b),
-       package(0),
-       component(0),
-       name(n),
-       tool(0),
-       state(INIT),
-       primary_target(0)
+       name(n)
 {
        builder.get_build_graph().add_target(this);
 }
@@ -61,8 +55,8 @@ Target *Target::get_buildable_target()
        bool self_ok = state!=BUILDING;
        for(Target *d: depends)
        {
-               // Avoid infinite recursion if a target repends on its own side effect
-               if(find(side_effects.begin(), side_effects.end(), d)!=side_effects.end())
+               // Avoid infinite recursion if a target depends on its own side effect
+               if(any_equals(side_effects, d))
                        continue;
 
                Target *tgt = d->get_buildable_target();
@@ -110,7 +104,7 @@ void Target::mark_rebuild(const string &reason)
        state = REBUILD;
        rebuild_reason = reason;
 
-       builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
+       builder.get_logger().log("rebuild", "Rebuilding %s: %s", name, reason);
 
        signal_bubble_rebuild.emit();
 }
@@ -121,7 +115,7 @@ void Target::prepare()
                return;
        if(state==PREPARING)
        {
-               builder.get_logger().log("problems", format("Dependency cycle detected at %s", name));
+               builder.get_logger().log("problems", "Dependency cycle detected at %s", name);
                problems.push_back("Dependency cycle detected");
                state = BROKEN;
                return;