Changeset 10375

Timestamp:

Apr 19, 2015, 10:07:27 PM (9 years ago)

Author:

landauf

Message:

trying to keep the correct order of parents

File:

• code/branches/core7/src/libraries/core/class/Identifier.cc (modified) (1 diff)

code/branches/core7/src/libraries/core/class/Identifier.cc

@@ -202 +202 @@
 
             // direct parents and their parents are also parents of this identifier (but only add them once)
-            this->parents_ = this->directParents_;
             for (std::list<const Identifier*>::const_iterator it_parent = this->directParents_.begin(); it_parent != this->directParents_.end(); ++it_parent)
+            {
                 for (std::list<const Identifier*>::const_iterator it_parent_parent = const_cast<Identifier*>(*it_parent)->parents_.begin(); it_parent_parent != const_cast<Identifier*>(*it_parent)->parents_.end(); ++it_parent_parent)
                     if (std::find(this->parents_.begin(), this->parents_.end(), *it_parent_parent) == this->parents_.end())
                         this->parents_.push_back(*it_parent_parent);
+                if (std::find(this->parents_.begin(), this->parents_.end(), *it_parent) == this->parents_.end())
+                    this->parents_.push_back(*it_parent);
+            }
         }
         else if (!this->isExactlyA(Class(Identifiable)))