X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=5d62a9a1ec759b1d6d2e06eb91aa363cfcb617a6;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=70ca861bc64cefb22c13c7d91c98eacfbef61a15;hpb=c7df14c38a87ceca13df47fa700d3f9fa250be91;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 70ca861..5d62a9a 100644
--- 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,13 +44,11 @@ private:
 	};
 
 private:
-	typedef std::map<std::string, BuildType> BuildTypeMap;
-
 	PackageManager package_manager;
 
 	Architecture native_arch;
 	Architecture *current_arch;
-	BuildTypeMap build_types;
+	std::map<std::string, BuildType> build_types;
 	BuildType *build_type;
 	Toolchain toolchain;
 	VirtualFileSystem vfs;
@@ -75,7 +72,7 @@ public:
 	const Architecture &get_native_arch() const { return native_arch; }
 	void set_build_type(const std::string &);
 	std::vector<std::string> get_build_types() const;
-	const BuildType &get_build_type() const { return *build_type; }
+	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 &);
@@ -88,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