Remove most container typedefs and refactor others

[builder.git] / source / buildercli.cpp

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index bf53c2912dfd59c964a9e8d96f26e14796105eea..1952f594bd7daece578b4d7e65e1608ba5044097 100644 (file)
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -126,7 +126,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
                string::size_type equal = i->find('=');
                if(equal!=string::npos)
                {
-                       cmdline_options.insert(Config::InputOptions::value_type(i->substr(0, equal), i->substr(equal+1)));
+                       cmdline_options.insert({ i->substr(0, equal), i->substr(equal+1) });
                        cmdline_targets.erase(i++);
                }
                else
@@ -353,7 +353,7 @@ void BuilderCLI::package_help()
 
        SourcePackage &main_pkg = dynamic_cast<SourcePackage &>(package_manager.get_main_package());
        const Config &config = main_pkg.get_config();
-       const Config::OptionMap &options = config.get_options();
+       const auto &options = config.get_options();
        const Package::Requirements &requires = main_pkg.get_required_packages();
 
        if(!requires.empty() || !options.empty())