diff --git a/lib/base/array-script.cpp b/lib/base/array-script.cpp index a97668350..7b6549f8f 100644 --- a/lib/base/array-script.cpp +++ b/lib/base/array-script.cpp @@ -131,7 +131,7 @@ static Array::Ptr ArrayMap(const Function::Ptr& function) ObjectLock olock(self); for (const Value& item : self) { - result.push_back(function->Invoke({ item })); + result.emplace_back(function->Invoke({ item })); } return new Array(std::move(result)); diff --git a/lib/base/array.cpp b/lib/base/array.cpp index 08e06fad2..7bea88350 100644 --- a/lib/base/array.cpp +++ b/lib/base/array.cpp @@ -262,7 +262,7 @@ Object::Ptr Array::Clone() const ObjectLock olock(this); for (const Value& val : m_Data) { - arr.push_back(val.Clone()); + arr.emplace_back(val.Clone()); } return new Array(std::move(arr)); diff --git a/lib/base/namespace-script.cpp b/lib/base/namespace-script.cpp index deaae7dec..8f5299873 100644 --- a/lib/base/namespace-script.cpp +++ b/lib/base/namespace-script.cpp @@ -63,7 +63,7 @@ static Array::Ptr NamespaceValues() ArrayData values; ObjectLock olock(self); for (const Namespace::Pair& kv : self) { - values.push_back(kv.second.Val); + values.emplace_back(kv.second.Val); } return new Array(std::move(values)); } diff --git a/lib/base/scriptutils.cpp b/lib/base/scriptutils.cpp index 7fe856de3..0d73d3d36 100644 --- a/lib/base/scriptutils.cpp +++ b/lib/base/scriptutils.cpp @@ -455,7 +455,7 @@ Array::Ptr ScriptUtils::GetTemplates(const Type::Ptr& type) for (const ConfigItem::Ptr& item : ConfigItem::GetItems(type)) { if (item->IsAbstract()) - result.push_back(GetTargetForTemplate(item)); + result.emplace_back(GetTargetForTemplate(item)); } return new Array(std::move(result)); diff --git a/lib/cli/clicommand.cpp b/lib/cli/clicommand.cpp index cfdce0946..2743987c7 100644 --- a/lib/cli/clicommand.cpp +++ b/lib/cli/clicommand.cpp @@ -41,7 +41,7 @@ std::vector icinga::GetBashCompletionSuggestions(const String& type, con if (lstat(path.CStr(), &statbuf) >= 0) { if (S_ISDIR(statbuf.st_mode)) { result.clear(), - result.push_back(path + "/"); + result.emplace_back(path + "/"); } } } diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp index 28ab0459d..e66654a57 100644 --- a/lib/cli/daemoncommand.cpp +++ b/lib/cli/daemoncommand.cpp @@ -634,7 +634,7 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vectorm_ActivationContext != context) { - newUnnamedItems.push_back(item); + newUnnamedItems.emplace_back(item); continue; } @@ -456,7 +456,7 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue for (const Type::Ptr& type : Type::GetAllTypes()) { if (ConfigObject::TypeInstance->IsAssignableFrom(type)) - types.insert(type); + types.emplace(type); } while (types.size() != completed_types.size()) { @@ -507,7 +507,7 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue itemsCount += committed_items; - completed_types.insert(type); + completed_types.emplace(type); #ifdef I2_DEBUG if (committed_items > 0) @@ -571,7 +571,7 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue { std::unique_lock lock(item->m_Mutex); - item->m_IgnoredItems.push_back(item->m_DebugInfo.Path); + item->m_IgnoredItems.emplace_back(item->m_DebugInfo.Path); } } }); @@ -580,7 +580,7 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue } } - completed_types.insert(type); + completed_types.emplace(type); #ifdef I2_DEBUG if (notified_items > 0) diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index 6fd30581c..59bc0048a 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -45,7 +45,7 @@ Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolv EscapeCallback(), resolvedMacros, useResolvedMacros, recursionLevel + 1); if (value.IsObjectType()) - resultArr.push_back(Utility::Join(value, ';')); + resultArr.emplace_back(Utility::Join(value, ';')); else resultArr.push_back(value); } diff --git a/lib/remote/deleteobjecthandler.cpp b/lib/remote/deleteobjecthandler.cpp index 2edb0e455..fc21f81ba 100644 --- a/lib/remote/deleteobjecthandler.cpp +++ b/lib/remote/deleteobjecthandler.cpp @@ -41,7 +41,7 @@ bool DeleteObjectHandler::HandleRequest( } QueryDescription qd; - qd.Types.insert(type->GetName()); + qd.Types.emplace(type->GetName()); qd.Permission = "objects/delete/" + type->GetName(); params->Set("type", type->GetName()); diff --git a/lib/remote/modifyobjecthandler.cpp b/lib/remote/modifyobjecthandler.cpp index cc008b90c..13ed7d550 100644 --- a/lib/remote/modifyobjecthandler.cpp +++ b/lib/remote/modifyobjecthandler.cpp @@ -39,7 +39,7 @@ bool ModifyObjectHandler::HandleRequest( } QueryDescription qd; - qd.Types.insert(type->GetName()); + qd.Types.emplace(type->GetName()); qd.Permission = "objects/modify/" + type->GetName(); params->Set("type", type->GetName()); diff --git a/lib/remote/objectqueryhandler.cpp b/lib/remote/objectqueryhandler.cpp index ad73030da..981e31e1b 100644 --- a/lib/remote/objectqueryhandler.cpp +++ b/lib/remote/objectqueryhandler.cpp @@ -115,7 +115,7 @@ bool ObjectQueryHandler::HandleRequest( } QueryDescription qd; - qd.Types.insert(type->GetName()); + qd.Types.emplace(type->GetName()); qd.Permission = "objects/query/" + type->GetName(); Array::Ptr uattrs, ujoins, umetas; @@ -174,7 +174,7 @@ bool ObjectQueryHandler::HandleRequest( if (ujoins) { ObjectLock olock(ujoins); for (const String& ujoin : ujoins) { - userJoinAttrs.insert(ujoin.SubStr(0, ujoin.FindFirstOf("."))); + userJoinAttrs.emplace(ujoin.SubStr(0, ujoin.FindFirstOf("."))); } } diff --git a/lib/remote/templatequeryhandler.cpp b/lib/remote/templatequeryhandler.cpp index e70dafb65..54da79d65 100644 --- a/lib/remote/templatequeryhandler.cpp +++ b/lib/remote/templatequeryhandler.cpp @@ -102,7 +102,7 @@ bool TemplateQueryHandler::HandleRequest( } QueryDescription qd; - qd.Types.insert(type->GetName()); + qd.Types.emplace(type->GetName()); qd.Permission = "templates/query/" + type->GetName(); qd.Provider = new TemplateTargetProvider();