Combine the processing of configuration and tool overrides

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 64cec87f15e48803e349ab2b5a242470d7cc4f56..6e570c8628eb07f5d1bef95190bc1c539b2454d9 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,6 +1,4 @@
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
-#include <msp/strings/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "package.h"
 
@@ -22,8 +20,8 @@ void Package::prepare()
        if(prepared)
                return;
 
-       for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-               (*i)->prepare();
+       for(Package *r: requires)
+               r->prepare();
 
        do_prepare();
        prepared = true;