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

diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp
index 1d2625425921a90c8bcff71507891d9228eb3d18..90714fc9d1df079fca648aab13da937d4479ecfe 100644 (file)
--- a/lib/icinga/checkable-dependency.cpp
+++ b/lib/icinga/checkable-dependency.cpp
@@ -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());
                }

diff --git a/lib/icinga/checkable.hpp b/lib/icinga/checkable.hpp
index 4060f1d00688b49777147e36657eadb4b52b2309..b2d118c31e816fb5cb4aff122039a3bd76cb8bdf 100644 (file)
--- a/lib/icinga/checkable.hpp
+++ b/lib/icinga/checkable.hpp
@@ -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;