Changeset 5626 in orxonox.OLD

Timestamp:

Nov 17, 2005, 12:01:45 PM (19 years ago)

Author:

bensch

Message:

trunk: optimizations, and operator== in BaseObject to compare ObjectNames

Location:

trunk/src

Files:

• defs/compiler.h (modified) (1 diff)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (1 diff)

trunk/src/defs/compiler.h

@@ -8 +8 @@
 #endif
 
-#define likely(x)       __builtin_expect((x),1)
-#define unlikely(x)     __builtin_expect((x),0)
-
-#ifdef __unix__
-
-// deprecated //
- #define __LIKELY_IF(condition)  if( likely(condition))
- #define __UNLIKELY_IF(condition) if( unlikely(condition))
-#else
- #define __LIKELY_IF(condition)  if( condition)
- #define __UNLIKELY_IF(condition) if( condition)
-#endif
+#define likely(x)       __builtin_expect((x),1)
+#define unlikely(x)     __builtin_expect((x),0)
 
 

trunk/src/lib/lang/base_object.cc

@@ -137 +137 @@
 }
 
+/**
+ * compares the ObjectName with an external name
+ * @param objectName: the name to check.
+ * @returns true on match, false otherwise.
+ */
+bool BaseObject::operator ==(const char* objectName)
+{
+  if (likely(this->objectName != NULL && objectName != NULL))
+    return (strcmp(this->objectName, objectName)) ? false : true;
+}
+
 
 /**

trunk/src/lib/lang/base_object.h

@@ -39 +39 @@
   void whatIs() const;
 
+  //
+  bool operator== (const char* objectName);
+
  protected:
   void setClassID(long classID, const char* className);