Changeset 10372 for code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc

Timestamp:

Apr 18, 2015, 1:07:08 PM (9 years ago)

Author:

landauf

Message:

use lists instead of sets to store parent identifiers. this allows to store the exact order of initialization of parent classes.

File:

• code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc (modified) (3 diffs)

code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc

@@ -19 +19 @@
     namespace
     {
-        class BaseInterface1 : public OrxonoxInterface
+        class BaseInterface1 : virtual public OrxonoxInterface
         {
             public:
@@ -30 +30 @@
         };
 
-        class BaseInterface2 : public OrxonoxInterface
+        class BaseInterface2 : virtual public OrxonoxInterface
         {
             public:
@@ -155 +155 @@
         };
 
+        bool contains(const std::list<const Identifier*> identifiers, Identifier* identifier)
+        {
+            return std::find(identifiers.begin(), identifiers.end(), identifier) != identifiers.end();
+        }
+
         bool contains(const std::set<const Identifier*> identifiers, Identifier* identifier)
         {