Changeset 9682 in orxonox.OLD for trunk

Timestamp:

Aug 22, 2006, 12:31:29 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: sync

Location:

trunk/src/lib/lang

Files:

• new_class_id.h (modified) (2 diffs)
• new_object_list.h (modified) (1 diff)
• test_object_list.cc (modified) (2 diffs)

trunk/src/lib/lang/new_class_id.h

@@ -13 +13 @@
 #include <list>
 
-
 //! A class to dynamically allocate ClassID's and support a isA operator
 class NewClassID
@@ -21 +20 @@
   ~NewClassID();
 
-  int leafClassID() const { return _classes.front()._objectList->id(); }
+  /** @returns the ClassName of the Topmost Object of the ClassStack */
+  inline const std::string& getClassName() const { return _classes.front()._objectList->name(); }
+  /** @returns the ID of the Topmost object of the ClassStack */
+  inline int leafClassID() const { return _classes.front()._objectList->id(); }
 
   template<class T> void registerObject(T* object, NewObjectList<T>& list);

trunk/src/lib/lang/new_object_list.h

@@ -18 +18 @@
    static NewObjectList<ClassName> objectList
 
-#define NewObjectListDefinition(ClassName) \
-   NewObjectList<ClassName> ClassName::objectList(#ClassName)
-
 #define NewObjectListDefinitionID(ClassName, ID) \
    NewObjectList<ClassName> ClassName::objectList(#ClassName, ID)
+
+
+#define NewObjectListDefinition(ClassName) \
+    NewObjectListDefinitionID(ClassName, -1)
 
 

trunk/src/lib/lang/test_object_list.cc

@@ -65 +65 @@
     this->registerObject(this, Bone::objectList);
     //this->_id.listInheritance();
-    std::cout << "LeafID:" << this->_id.leafClassID() << std::endl;
+    //std::cout << "LeafID:" << this->_id.leafClassID() << std::endl;
 
     //std::cout << "Bone()\n";
@@ -85 +85 @@
     std::cout<< i <<  std::endl ;
     Bone* test = new Bone[COUNT];
-    delete[]test;
+    delete []test;
   }
   //   char tmp[100];