Changeset 9924 in orxonox.OLD for branches/network/src/lib/lang/object_list.cc

Timestamp:

Nov 9, 2006, 7:16:15 PM (18 years ago)

Author:

bensch

Message:

network: removed obsolete class_id_DEPRECATED.h and adapted the objectList… now the compile bugs have to be fixed

File:

• branches/network/src/lib/lang/object_list.cc (modified) (6 diffs)

branches/network/src/lib/lang/object_list.cc

@@ -25 +25 @@
  * @return a new NewObejctList
  */
-ObjectListBase::ObjectListBase(const std::string& className, int id)
+ObjectListBase::ObjectListBase(const std::string& className)
     : _name(className)
 {
@@ -36 +36 @@
   assert(!ObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
 
-  if (id == -1)
-  {
-    id = ObjectListBase::_classesByID->size();
-    // searching for a free ID
-    while (ObjectListBase::classIDExists(id)) ++id;
-  }
+  int id = ObjectListBase::_classesByID->size();
+  // searching for a free ID
+  while (ObjectListBase::classIDExists(id)) ++id;
+
   assert(!ObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
 
@@ -342 +340 @@
     assert( false && "size of str2id does not match" );
   }
-  
+
   IDMap * map = new IDMap();
-  
+
   std::map< std::string, int >::const_iterator it;
   for ( it = str2id.begin(); it != str2id.end(); it++ )
@@ -352 +350 @@
     (*map)[ it->second ]->_id = it->second;
   }
-  
+
   delete _classesByID;
   _classesByID = map;
@@ -358 +356 @@
 
 /**
- * 
- * @return 
+ *
+ * @return
  */
 std::map< std::string, int > * ObjectListBase::createStrToId( )
 {
   std::map< std::string, int > * res = new std::map< std::string, int >();
-  
+
   NameMap::const_iterator it;
   for ( it = _classesByName->begin(); it != _classesByName->end(); it++ )
@@ -378 +376 @@
       }
     }
-    
+
     assert( id != -1 );
     (*res)[ it->first ] = id;
   }
-  
+
   return res;
 }