Add the target type to a lexical_cast invocation

[builder.git] / source / analyzer.cpp

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index 70f5f2076f3a68de00f74479f5f36f2565edee14..eaf017be6753e29ee935a5dbab698e605b41a08c 100644 (file)
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -3,8 +3,8 @@
 #include "analyzer.h"
 #include "builder.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 #include "target.h"
 #include "tool.h"
 
@@ -26,7 +26,7 @@ void Analyzer::analyze()
                const Builder::TargetMap &targets = builder.get_targets();
                for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
                {
-                       const Target::Dependencies &depends = i->second->get_depends();
+                       const Target::Dependencies &depends = i->second->get_dependencies();
                        for(Target::Dependencies::const_iterator j=depends.begin(); j!=depends.end(); ++j)
                                rdepends[*j].insert(i->second);
                }
@@ -45,7 +45,7 @@ void Analyzer::analyze()
        Target &cmdline = *builder.get_target("cmdline");
        if(mode==RDEPS)
        {
-               const Target::Dependencies &deps = cmdline.get_depends();
+               const Target::Dependencies &deps = cmdline.get_dependencies();
                for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
                        build_depend_table(**i, 0);
        }
@@ -66,7 +66,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
                if(const ObjectFile *obj = dynamic_cast<const ObjectFile *>(&tgt))
                        return build_depend_table(obj->get_source(), depth);
        }
-       else if(mode==REBUILD && !tgt.get_rebuild() && !real->get_rebuild())
+       else if(mode==REBUILD && !tgt.needs_rebuild())
                /* All targets that depend on to-be-built targets will be rebuilt
                themselves, so we can stop here. */
                return;
@@ -94,13 +94,8 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
        else
                row.push_back("");
 
-       if(tgt.get_rebuild())
-       {
-               if(tgt.get_rebuild_reason().empty())
-                       row.push_back("Yes (no reason)");
-               else
-                       row.push_back(tgt.get_rebuild_reason());
-       }
+       if(tgt.needs_rebuild())
+               row.push_back(tgt.get_rebuild_reason());
 
        table.push_back(row);
 
@@ -113,7 +108,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
                        depends.assign(rdeps.begin(), rdeps.end());
                }
                else
-                       depends = tgt.get_depends();
+                       depends = tgt.get_dependencies();
 
                depends.sort(full_paths ? target_order_full : target_order);
 
@@ -142,7 +137,7 @@ void Analyzer::print_table() const
                {
                        if(j>0)
                                line += "  ";
-                       line += lexical_cast((*i)[j], Fmt("%-s").width(col_width[j]));
+                       line += lexical_cast<string>((*i)[j], Fmt("%-s").width(col_width[j]));
                }
                IO::print("%s\n", line);
        }