Changeset 941 for code/branches

Timestamp:

Mar 27, 2008, 8:23:10 PM (17 years ago)

Author:

landauf

Message:

• small change in the initialization of the Identifier-singleton
• fixed debug output when removing objects

Location:

code/branches/core2/src/orxonox/core

Files:

• Identifier.h (modified) (1 diff)
• MetaObjectList.h (modified) (1 diff)

code/branches/core2/src/orxonox/core/Identifier.h

@@ -273 +273 @@
     ClassIdentifier<T>* ClassIdentifier<T>::registerClass(std::set<const Identifier*>* parents, const std::string& name, bool bRootClass)
     {
-        COUT(5) << "*** ClassIdentifier: Register Class in " << name << "-Singleton." << std::endl;
+        this->setName(name);
 
         // Check if at least one object of the given type was created
-        if (!this->bCreatedOneObject_)
+        if (!this->bCreatedOneObject_ && Identifier::isCreatingHierarchy())
         {
             // If no: We have to store the informations and initialize the Identifier
-            this->setName(name);
-
             COUT(4) << "*** ClassIdentifier: Register Class in " << name << "-Singleton -> Initialize Singleton." << std::endl;
             if (bRootClass)

code/branches/core2/src/orxonox/core/MetaObjectList.h

@@ -99 +99 @@
 
 
-        COUT(5) << "*** MetaObjectList: Removing Object from " << this->element_->object_->getIdentifier()->getName() << "-list." << std::endl;
+        COUT(5) << "*** MetaObjectList: Removing Object from " << ClassManager<T>::getIdentifier()->getName() << "-list." << std::endl;
         delete this->element_;
     }