tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use std::vector instead of std::set where appropriate

This commit is contained in:
Gunnar Beutner 2017-11-23 15:32:33 +01:00
parent 2e87c280ed
commit 59fca5d5ac
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/checkable-dependency.cpp
View File

@ -35,10 +35,10 @@ void Checkable::RemoveDependency(const Dependency::Ptr& dep)
m_Dependencies.erase(dep);
}
std::set<Dependency::Ptr> Checkable::GetDependencies(void) const
std::vector<Dependency::Ptr> Checkable::GetDependencies(void) const
{
boost::mutex::scoped_lock lock(m_DependencyMutex);
return m_Dependencies;
return std::vector<Dependency::Ptr>(m_Dependencies.begin(), m_Dependencies.end());
}
void Checkable::AddReverseDependency(const Dependency::Ptr& dep)
@ -53,10 +53,10 @@ void Checkable::RemoveReverseDependency(const Dependency::Ptr& dep)
m_ReverseDependencies.erase(dep);
}
std::set<Dependency::Ptr> Checkable::GetReverseDependencies(void) const
std::vector<Dependency::Ptr> Checkable::GetReverseDependencies(void) const
{
boost::mutex::scoped_lock lock(m_DependencyMutex);
return m_ReverseDependencies;
return std::vector<Dependency::Ptr>(m_ReverseDependencies.begin(), m_ReverseDependencies.end());
}
bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency, int rstack) const
@ -148,7 +148,7 @@ void Checkable::GetAllChildrenInternal(std::set<Checkable::Ptr>& children, int l
for (const Checkable::Ptr& checkable : children) {
std::set<Checkable::Ptr> cChildren = checkable->GetChildren();
if (!checkable->GetChildren().empty()) {
if (!cChildren.empty()) {
GetAllChildrenInternal(cChildren, level + 1);
localChildren.insert(cChildren.begin(), cChildren.end());
}

4
lib/icinga/checkable.hpp
View File

@ -185,11 +185,11 @@ public:
/* Dependencies */
void AddDependency(const intrusive_ptr<Dependency>& dep);
void RemoveDependency(const intrusive_ptr<Dependency>& dep);
std::set<intrusive_ptr<Dependency> > GetDependencies(void) const;
std::vector<intrusive_ptr<Dependency> > GetDependencies(void) const;
void AddReverseDependency(const intrusive_ptr<Dependency>& dep);
void RemoveReverseDependency(const intrusive_ptr<Dependency>& dep);
std::set<intrusive_ptr<Dependency> > GetReverseDependencies(void) const;
std::vector<intrusive_ptr<Dependency> > GetReverseDependencies(void) const;
virtual void ValidateCheckInterval(double value, const ValidationUtils& utils) override;
virtual void ValidateMaxCheckAttempts(int value, const ValidationUtils& utils) override;