Changeset 4837 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 12, 2005, 3:11:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: derivation of superclasses is more clear now. lets see, if this will hold out for some time (about 115 classes long)

File:

• orxonox/trunk/src/lib/lang/base_object.cc (modified) (1 diff)

orxonox/trunk/src/lib/lang/base_object.cc

@@ -103 +103 @@
 bool BaseObject::isA (long classID) const
 {
-  // if classID is a derivable object
-  if ( likely(classID & CL_MASK_SUPER_CLASS || classID & CL_MASK_SUBSUPER_CLASS))
+  // if classID is a derivable object from a SUPERCLASS
+  if (classID & CL_MASK_SUPER_CLASS)
   {
-    if( this->classID & classID)
+    if( likely(this->classID & classID))
       return true;
-  } // if classID is a LOWLEVEL-class
+  }
+  // if classID is a SubSuperClass, and
+  else if (classID & CL_MASK_SUBSUPER_CLASS)
+  {
+    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_ID) == (this->classID & CL_MASK_SUBSUPER_CLASS_ID)) &&
+        this->classID & classID & CL_MASK_SUBSUPER_CLASS_ID2))
+      return true;
+  }
+  // if classID is a LOWLEVEL-class
   else
   {
-    if( (this->classID & CL_MASK_LOWLEVEL_CLASS) == classID)
+    if( likely((this->classID & CL_MASK_LOWLEVEL_CLASS) == classID))
       return true;
   }