Changeset 9656 in orxonox.OLD for trunk/src/util/object_manager.cc

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/util/object_manager.cc (modified) (3 diffs)

trunk/src/util/object_manager.cc

@@ -134 +134 @@
   if (omList != OM_INIT || omList == OM_SIZE)
   {
-    PRINT(0)(" +ObjectManager-LIST: '%s'==size='%d'==---\n", ObjectManager::OMListToString((OM_LIST)omList), this->objectLists[omList].size());
+    PRINT(0)(" +ObjectManager-LIST: '%s'==size='%d'==---\n", ObjectManager::OMListToString((OM_LIST)omList).c_str(), this->objectLists[omList].size());
   //  if (level >= 1)
     {
@@ -174 +174 @@
  * @returns the String transformed from omList.
  */
-const char* ObjectManager::OMListToString(OM_LIST omList)
+const std::string& ObjectManager::OMListToString(OM_LIST omList)
 {
   if (omList == OM_INIT || omList == OM_SIZE)
-    return "===invalid===";
+    return ObjectManager::objectManagerListNames[OM_NULL];
 
   printf("%d\n", omList);
@@ -199 +199 @@
     }
   }
-  return OM_DEFAULT_LIST;
-}
-
-
-
-const char* ObjectManager::objectManagerListNames[] = {
+  return OM_NULL;
+}
+
+
+
+const std::string ObjectManager::objectManagerListNames[] = {
     "null",
     "dead",