X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.h;h=a82e53685c390b0fdc7e528b1a2ad9a71b3199b2;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=1f7fa712839f5b5bdc346681e3a346c117aafba4;hpb=153372211c242e539754680b5fe979e3be61ebfe;p=builder.git

diff --git a/source/config.h b/source/config.h
index 1f7fa71..a82e536 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,10 +37,10 @@ private:
 	};
 
 	SourcePackage &package;
-	OptionMap options;
+	std::map<std::string, Option> options;
 	InputOptions pending_options;
 	Msp::Time::TimeStamp mtime;
-	bool changed;
+	mutable bool changed;
 
 public:
 	Config(SourcePackage &);
@@ -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();