Remove most container typedefs and refactor others

[builder.git] / source / config.h

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