Changeset 5915 in orxonox.OLD for trunk/src/lib/lang

Timestamp:

Dec 4, 2005, 3:34:36 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/spaceshipControll back to the trunk:
merged with command:
svn merge -r5835:HEAD branches/spaceshipcontroll trunk
conflicts resolved with dynamic indentation methodology algorithms

Location:

trunk/src/lib/lang

Files:

• base_object.cc (modified) (1 diff)
• class_list.h (modified) (2 diffs)

trunk/src/lib/lang/base_object.cc

@@ -112 +112 @@
   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))
+    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_IDA) == (this->classID & CL_MASK_SUBSUPER_CLASS_IDA)) &&
+        this->classID & classID & CL_MASK_SUBSUPER_CLASS_IDB))
       return true;
   }

trunk/src/lib/lang/class_list.h

@@ -46 +46 @@
     static bool                           exists(const BaseObject* object, ClassID classID = CL_NULL);
 
+    void                                  sendBack(std::list<BaseObject*>::const_iterator it);
+
     static void                           whatIs(const BaseObject* object);
 
@@ -51 +53 @@
     static long                           StringToID(const char* className);
     static void                           debug(unsigned int debugLevel = 0, long classID = CL_NULL);
-    static void                           debugS(const char* className = 0x0, unsigned int debugLevel = 0);
+    static void                           debugS(const char* className = NULL, unsigned int debugLevel = 0);
 
     inline bool                           operator==(ClassID classID) { return (this->classID == classID); };