tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 05:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use std::vector<std::string> for command-line arguments

Browse Source
This commit is contained in:
Gunnar Beutner 2018-02-26 08:34:45 +01:00
parent a0aa781417
commit 5dd0bc8f97
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cli/nodesetupcommand.cpp
View File

@ -65,7 +65,7 @@ void NodeSetupCommand::InitParameters(boost::program_options::options_descriptio
("accept-config", "Accept config from master") ("accept-config", "Accept config from master")
("accept-commands", "Accept commands from master") ("accept-commands", "Accept commands from master")
("master", "Use setup for a master instance") ("master", "Use setup for a master instance")
("global_zones", po::value<std::vector<String> >(), "The names of the additional global zones."); ("global_zones", po::value<std::vector<std::string> >(), "The names of the additional global zones.");
hiddenDesc.add_options() hiddenDesc.add_options()
("master_zone", po::value<std::string>(), "The name of the master zone"); ("master_zone", po::value<std::string>(), "The name of the master zone");
@ -159,10 +159,10 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
Log(LogInformation, "cli", "Generating zone and object configuration."); Log(LogInformation, "cli", "Generating zone and object configuration.");
std::vector<String> globalZones; std::vector<String> globalZones;
std::vector<String> setupGlobalZones; std::vector<std::string> setupGlobalZones;
if (vm.count("global_zones")) if (vm.count("global_zones"))
setupGlobalZones = vm["global_zones"].as<std::vector<String> >(); setupGlobalZones = vm["global_zones"].as<std::vector<std::string> >();
globalZones.push_back("global-templates"); globalZones.push_back("global-templates");
globalZones.push_back("director-global"); globalZones.push_back("director-global");
@ -430,10 +430,10 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm,
Log(LogInformation, "cli", "Generating zone and object configuration."); Log(LogInformation, "cli", "Generating zone and object configuration.");
std::vector<String> globalZones; std::vector<String> globalZones;
std::vector<String> setupGlobalZones; std::vector<std::string> setupGlobalZones;
if (vm.count("global_zones")) if (vm.count("global_zones"))
setupGlobalZones = vm["global_zones"].as<std::vector<String> >(); setupGlobalZones = vm["global_zones"].as<std::vector<std::string> >();
globalZones.push_back("global-templates"); globalZones.push_back("global-templates");
globalZones.push_back("director-global"); globalZones.push_back("director-global");