Changeset 8361 in orxonox.OLD for trunk

Timestamp:

Jun 14, 2006, 9:49:56 AM (18 years ago)

Author:

bensch

Message:

trunk: ClassList is a friend of BaseObject, so that the addToClassList and removeFromClassList functions can be private

recently those functions were used, where they should not have been.

this problem could also arise in the ObjectManager, if someone uses the internal functions from there

maybe friending there too soon (after the 8'th july )

File:

• trunk/src/lib/lang/class_list.h (modified) (2 diffs)

trunk/src/lib/lang/class_list.h

@@ -29 +29 @@
  */
 class ClassList {
+  friend class BaseObject;
+
   public:
     ClassList(ClassID classID, unsigned long classIDFull, const std::string& className);
     virtual ~ClassList();
-
-    /* MAINTENANCE FUNCTIONS THESE ARE !!ONLY FOR BASEOBJECT !! */
-    static ClassList*                     addToClassList(BaseObject* objectPointer, ClassID classID, unsigned long classIDFull, const std::string& className);
-    static void                           removeFromClassList(BaseObject* objectPointer);
-
-
 
     static const std::list<BaseObject*>*  getList(ClassID classID = CL_NULL);// { return (ClassList* fl = ClassList::getClassList(classID) != NULL)? &(fl->objectList) : NULL; };
@@ -61 +57 @@
 
   private:
+    /* MAINTENANCE FUNCTIONS THESE ARE !!ONLY FOR BASEOBJECT !! */
+    static ClassList*                     addToClassList(BaseObject* objectPointer, ClassID classID, unsigned long classIDFull, const std::string& className);
+    static void                           removeFromClassList(BaseObject* objectPointer);
+
     static ClassList*                     getClassList(ClassID classID);
     static ClassList*                     getClassList(const std::string& className);