Changeset 805 for code/branches/core/src/orxonox/core/ClassTreeMask.cc

Timestamp:

Feb 12, 2008, 4:24:14 PM (16 years ago)

Author:

landauf

Message:

Added two new classes:

• ClassManager, a helper class for ClassIdentifier
• IdentifierDistributor, a class that hopefully allows unique ClassIdentifiers even with several libraries

In a first try it seemed to work, but it needs more testing. At least it solved a problem I discovered yesterday with multiple Identifiers for the type "BaseObject" on windows.

File:

• code/branches/core/src/orxonox/core/ClassTreeMask.cc (modified) (3 diffs)

code/branches/core/src/orxonox/core/ClassTreeMask.cc

@@ -156 +156 @@
     ClassTreeMask::ClassTreeMask()
     {
-        this->root_ = new ClassTreeMaskNode(ClassIdentifier<BaseObject>::getIdentifier(), true);
+        this->root_ = new ClassTreeMaskNode(ClassManager<BaseObject>::getIdentifier("BaseObject"), true);
     }
 
@@ -227 +227 @@
     {
         delete this->root_;
-        this->root_ = new ClassTreeMaskNode(ClassIdentifier<BaseObject>::getIdentifier(), true);
+        this->root_ = new ClassTreeMaskNode(ClassManager<BaseObject>::getIdentifier("BaseObject"), true);
     }
 
@@ -237 +237 @@
     bool ClassTreeMask::isIncluded(ClassTreeMaskNode* node, const Identifier* subclass) const
     {
-std::cout << "1_0: " << ClassIdentifier<BaseObject>::getIdentifier() << std::endl;
 std::cout << "1_1: " << subclass->getName() << " (" << subclass << ") / " << node->getClass()->getName() << " (" << node->getClass() << ")" << std::endl;
         // Check if the searched subclass is of the same type as the class in the current node or a derivative