Replace std::vector:push_back with initializer list

This replaces a few std::vector::push_back calls with initializer lists.

diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index 859a58d78482a968456f7b8965246570dbfe0c99..bd7d7d409e0b99ecf206d0ae7838e1e2b3650062 100644 (file)
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -158,15 +158,12 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
        /* write zones.conf and update with zone + endpoint information */
        Log(LogInformation, "cli", "Generating zone and object configuration.");
 
-       std::vector<String> globalZones;
+       std::vector<String> globalZones { "global-templates", "director-global" };
        std::vector<std::string> setupGlobalZones;
 
        if (vm.count("global_zones"))
                setupGlobalZones = vm["global_zones"].as<std::vector<std::string> >();
 
-       globalZones.push_back("global-templates");
-       globalZones.push_back("director-global");
-
        for (int i = 0; i < setupGlobalZones.size(); i++) {
                if (std::find(globalZones.begin(), globalZones.end(), setupGlobalZones[i]) != globalZones.end()) {
                        Log(LogCritical, "cli")
@@ -429,15 +426,12 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm,
 
        Log(LogInformation, "cli", "Generating zone and object configuration.");
 
-       std::vector<String> globalZones;
+       std::vector<String> globalZones { "global-templates", "director-global" };
        std::vector<std::string> setupGlobalZones;
 
        if (vm.count("global_zones"))
                setupGlobalZones = vm["global_zones"].as<std::vector<std::string> >();
 
-       globalZones.push_back("global-templates");
-       globalZones.push_back("director-global");
-
        for (int i = 0; i < setupGlobalZones.size(); i++) {
                if (std::find(globalZones.begin(), globalZones.end(), setupGlobalZones[i]) != globalZones.end()) {
                        Log(LogCritical, "cli")

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index b08dcbc31c4e26f92a241c83d7e4603ba76238f1..07a743c85b1f666e97769ad5f28cb43b35262d0d 100644 (file)
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -499,10 +499,7 @@ wizard_ticket:
        /* apilistener config */
        Log(LogInformation, "cli", "Generating local zones.conf.");
 
-       std::vector<String> globalZones;
-
-       globalZones.push_back("global-templates");
-       globalZones.push_back("director-global");
+       std::vector<String> globalZones { "global-templates", "director-global" };
 
        std::cout << "\nDo you want to specify additional global zones? [y/N]: ";
 
@@ -633,10 +630,7 @@ int NodeWizardCommand::MasterSetup() const
        else
                std::cout << "'api' feature already enabled.\n";
 
-       std::vector<String> globalZones;
-
-       globalZones.push_back("global-templates");
-       globalZones.push_back("director-global");
+       std::vector<String> globalZones { "global-templates", "director-global" };
 
        std::cout << "\nDo you want to specify additional global zones? [y/N]: ";