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

Timestamp:

Feb 18, 2006, 5:21:03 PM (19 years ago)

Author:

bensch

Message:

trunk:fixed a runtime-bug

Location:

trunk/src/lib

Files:

• Makefile.am (modified) (2 diffs)
• lang/class_list.cc (modified) (3 diffs)
• lang/class_list.h (modified) (1 diff)

trunk/src/lib/Makefile.am

@@ -5 +5 @@
 
 libORXlibs_a_SOURCES = \
-                coord/p_node.cc \
                 lang/base_object.cc \
                 lang/class_list.cc \
-                data/data_tank.cc \
+                coord/p_node.cc \
                 util/substring.cc \
                 util/color.cc \
                 util/helper_functions.cc \
                 util/multi_type.cc \
-                util/executor/executor.cc
+                util/executor/executor.cc \
+                data/data_tank.cc
 
 noinst_HEADERS = \
-                coord/p_node.h \
                 lang/base_object.h \
-                data/data_tank.h \
-                graphics/render2D/element_2d.h \
-                graphics/render2D/render_2d.h \
                 lang/class_list.h \
                 util/substring.h \
@@ -32 +28 @@
                 util/executor/executor_specials.h \
                 util/executor/functor_list.h \
-                util/count_pointer.h
+                util/count_pointer.h \
+                coord/p_node.h \
+                data/data_tank.h \
+                graphics/render2D/element_2d.h \
+                graphics/render2D/render_2d.h
 
 SUBDIRS = \

trunk/src/lib/lang/class_list.cc

@@ -178 +178 @@
  * !!PRIVATE!!
  * @param classID the ClassID to search for
- * @returns the ClassList with classID as specifyer, or NULL if not
+ * @returns the ClassList with classID as specifier, or NULL if not
  */
 ClassList* ClassList::getClassList(ClassID classID)
 {
-  std::vector<ClassList>::iterator classIT = find (ClassList::classList->begin(), ClassList::classList->end(), classID);
+  std::vector<ClassList>::iterator classIT = std::find (ClassList::classList->begin(), ClassList::classList->end(), classID);
   return (likely(classIT != classList->end()))? &(*classIT) : NULL;
 }
@@ -190 +190 @@
  * !!PRIVATE!!
  * @param className the ClassName to search for
- * @returns the ClassList with className as specifyer, or NULL if not
+ * @returns the ClassList with className as specifier, or NULL if not
  */
 ClassList* ClassList::getClassList(const char* className)
@@ -196 +196 @@
   if (className == NULL)
     return NULL;
-  std::vector<ClassList>::iterator classIT = find (classList->begin(), classList->end(), className);
+  std::vector<ClassList>::iterator classIT = find (ClassList::classList->begin(), ClassList::classList->end(), className);
   return (likely(classIT != classList->end()))? &(*classIT) : NULL;
 }

trunk/src/lib/lang/class_list.h

@@ -59 +59 @@
     inline bool                           operator==(ClassID classID) { return (this->classID == classID); };
     bool                                  operator==(const char* className);
+    bool                                  operator<(ClassID classID) { return this->classID < classID; };
+
     inline ClassID                        getLeafClassID() const { return this->classID; };