Use default member initializers and constructor delegation

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index b7b0b78b407e4445a1f354b74e08d7571f3a9aaf..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>
@@ -48,9 +47,9 @@ private:
        PackageManager package_manager;
 
        Architecture native_arch;
-       Architecture *current_arch;
+       Architecture *current_arch = 0;
        std::map<std::string, BuildType> build_types;
-       BuildType *build_type;
+       BuildType *build_type = 0;
        Toolchain toolchain;
        VirtualFileSystem vfs;
        BuildGraph build_graph;
@@ -58,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();
@@ -86,7 +85,7 @@ 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