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

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

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

trunk/src/util/object_manager.cc

@@ -26 +26 @@
 #include "debug.h"
 
-using namespace std;
+
 SHELL_COMMAND(debug, ObjectManager, debug)
     ->defaultValues("", 0);
@@ -117 +117 @@
   {
 
-    list<BaseObject*>::const_iterator node;
+    std::list<BaseObject*>::const_iterator node;
     for (node = objectList->begin(); node != objectList->end(); node++)
       if ((dynamic_cast<PNode*>(*node)->getAbsCoor() - center.getAbsCoor()).len() < radius)
@@ -140 +140 @@
       for (entity = this->objectLists[omList].begin(); entity != this->objectLists[omList].end(); entity++)
       {
-        PRINT(0)(" | %s::%s\n",(*entity)->getClassName(), (*entity)->getName());
+        PRINT(0)(" | %s::%s\n",(*entity)->getClassCName(), (*entity)->getCName());
       }
     }