Changeset 10370 for code/branches/core7/src/libraries/core/class

Timestamp:

Apr 16, 2015, 9:59:58 PM (10 years ago)

Author:

landauf

Message:

more checks.

Location:

code/branches/core7/src/libraries/core/class

Files:

• IdentifierManager.cc (modified) (3 diffs)
• IdentifierManager.h (modified) (1 diff)

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

@@ -54 +54 @@
         this->hierarchyCreatingCounter_s = 0;
         this->classIDCounter_s = 0;
+        this->recordTraceForIdentifier_ = NULL;
     }
 
@@ -119 +120 @@
                 {
                     this->identifierTraceOfNewObject_.clear();
+                    this->recordTraceForIdentifier_ = it->second;
+
                     Identifiable* temp = it->second->fabricate(&temporaryContext);
+
+                    this->recordTraceForIdentifier_ = NULL;
+
                     if (temp->getIdentifier() != it->second)
                         orxout(internal_error) << "Newly created object of type " << it->second->getName() << " has unexpected identifier. Did you forget to use RegisterObject(classname)?" << endl;
@@ -209 +215 @@
     {
         if (this->isCreatingHierarchy())
-            this->identifierTraceOfNewObject_[identifiable].insert(identifiable->getIdentifier());
+        {
+            if (this->recordTraceForIdentifier_)
+            {
+                if (this->identifierTraceOfNewObject_[identifiable].insert(identifiable->getIdentifier()).second == false)
+                {
+                    orxout(internal_warning) << this->recordTraceForIdentifier_->getName() << " inherits two times from " <<
+                        identifiable->getIdentifier()->getName() << ". Did you forget to use virtual inheritance?" << endl;
+                }
+            }
+        }
         else
             orxout(internal_warning) << "createdObject() called outside of class hierarchy creation" << endl;

code/branches/core7/src/libraries/core/class/IdentifierManager.h

@@ -112 +112 @@
             /// a consequence of this, e.g. nested member objects).
             std::map<Identifiable*, std::set<const Identifier*> > identifierTraceOfNewObject_;
+            Identifier* recordTraceForIdentifier_; //!< The identifier for which we want to record the trace of identifiers during object creation. If null, no trace is recorded.
     };
 }