X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=ba8416b923a24128416623c22e08377facf5b220;hb=c8c51fac9453a677fc3e6932c4730f35e237af89;hp=3257794671530e119edcc9de67a9f78633d2d0c6;hpb=c7df14c38a87ceca13df47fa700d3f9fa250be91;p=builder.git

diff --git a/source/config.h b/source/config.h
index 3257794..ba8416b 100644
--- a/source/config.h
+++ b/source/config.h
@@ -25,8 +25,7 @@ public:
 		Option(const Feature &);
 	};
 
-	typedef std::map<std::string, Option> OptionMap;
-	typedef std::map<std::string, std::string> InputOptions;
+	using InputOptions = std::map<std::string, std::string>;
 
 private:
 	class Loader: public Msp::DataFile::ObjectLoader<Config>
@@ -38,13 +37,13 @@ private:
 	};
 
 	SourcePackage &package;
-	OptionMap options;
+	std::map<std::string, Option> options;
 	InputOptions pending_options;
 	Msp::Time::TimeStamp mtime;
-	mutable bool changed;
+	mutable bool changed = false;
 
 public:
-	Config(SourcePackage &);
+	Config(SourcePackage &p): package(p) { }
 
 	/** Adds a configuration option based on a feature. */
 	const Option &add_option(const Feature &);
@@ -57,7 +56,7 @@ public:
 	/** Gets a configuration option by name. */
 	const Option &get_option(const std::string &) const;
 
-	const OptionMap &get_options() const { return options; }
+	const std::map<std::string, Option> &get_options() const { return options; }
 	const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
 
 	void load();