Use default member initializers and constructor delegation

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index d12cf003a68d7fc4d994b47b9dcb8f611f1622ff..331c50ab9a57be2c92fb2ed91a4fab98c598d2b0 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,7 +1,6 @@
 #ifndef BUILDER_H_
 #define BUILDER_H_
 
-#include <list>
 #include <map>
 #include <string>
 #include <msp/datafile/loader.h>
@@ -45,14 +44,12 @@ private:
        };
 
 private:
-       typedef std::map<std::string, BuildType> BuildTypeMap;
-
        PackageManager package_manager;
 
        Architecture native_arch;
-       Architecture *current_arch;
-       BuildTypeMap build_types;
-       BuildType *build_type;
+       Architecture *current_arch = 0;
+       std::map<std::string, BuildType> build_types;
+       BuildType *build_type = 0;
        Toolchain toolchain;
        VirtualFileSystem vfs;
        BuildGraph build_graph;
@@ -60,9 +57,9 @@ private:
        const Logger *logger;
 
        Msp::FS::Path prefix;
-       Msp::FS::Path tempdir;
+       Msp::FS::Path tempdir = "temp";
 
-       Loader *top_loader;
+       Loader *top_loader = 0;
 
 public:
        Builder();
@@ -74,7 +71,8 @@ public:
        const Architecture &get_current_arch() const { return *current_arch; }
        const Architecture &get_native_arch() const { return native_arch; }
        void set_build_type(const std::string &);
-       const BuildType &get_build_type() const { return *build_type; }
+       std::vector<std::string> get_build_types() const;
+       const BuildType &get_build_type() const;
        BuildGraph &get_build_graph() { return build_graph; }
        void set_prefix(const Msp::FS::Path &);
        void set_temp_directory(const Msp::FS::Path &);
@@ -87,13 +85,16 @@ public:
        void set_logger(const Logger *);
        const Logger &get_logger() const { return *logger; }
 
-       std::list<std::string> collect_problems() const;
+       std::vector<std::string> collect_problems() const;
 
        /** Loads a build file.  If opts is not null, it is used to configure any
        packages loaded from this file.  If all is true, external packages are also
        configured. */
        void load_build_file(const Msp::FS::Path &, const Config::InputOptions *opts = 0, bool all = false);
 
+       /** Saves package configuration and dependency caches. */
+       void save_caches();
+
        /** Builds the goal targets.  The build graph must be prepared first. */
        int build(unsigned jobs = 1, bool dry_run = false, bool show_progress = false);