Inline simple constructors

[builder.git] / source / compilecommandsgenerator.cpp

diff --git a/source/compilecommandsgenerator.cpp b/source/compilecommandsgenerator.cpp
index 07ee15e779245f1f9f901ad063b317c20a9be005..8e3947d7816a119916097b7bd7079b819759dd96 100644 (file)
--- a/source/compilecommandsgenerator.cpp
+++ b/source/compilecommandsgenerator.cpp
@@ -10,11 +10,7 @@
 using namespace std;
 using namespace Msp;
 
-CompileCommandsGenerator::CompileCommandsGenerator(Builder &b):
-       Tool(b, "CCJG")
-{ }
-
-Target *CompileCommandsGenerator::create_target(const list<Target *> &, const string &)
+Target *CompileCommandsGenerator::create_target(const vector<Target *> &, const string &)
 {
        throw logic_error("Not implemented");
 }
@@ -27,10 +23,6 @@ Task *CompileCommandsGenerator::run(const Target &target) const
 }
 
 
-CompileCommandsGenerator::Worker::Worker(const CompileCommandsJson &t):
-       target(t)
-{ }
-
 void CompileCommandsGenerator::Worker::main()
 {
        Builder &builder = target.get_package()->get_builder();
@@ -41,13 +33,12 @@ void CompileCommandsGenerator::Worker::main()
        IO::print(out, "[");
 
        bool first = true;
-       const BuildGraph::TargetMap &targets = builder.get_build_graph().get_targets();
-       for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-               if(i->second->is_buildable() && i->second->get_package()==&spkg)
-                       if(ObjectFile *obj = dynamic_cast<ObjectFile *>(i->second))
+       for(const auto &kvp: builder.get_build_graph().get_targets())
+               if(kvp.second->is_buildable() && kvp.second->get_package()==&spkg)
+                       if(ObjectFile *obj = dynamic_cast<ObjectFile *>(kvp.second))
                        {
                                FS::Path src_path = obj->get_source().get_path();
-                               Task *task = i->second->build();
+                               Task *task = kvp.second->build();
                                if(!first)
                                        out.put(',');
                                IO::print(out, "\n\t{\n");