Changeset 9406 in orxonox.OLD for trunk/src/lib/util/loading/factory.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/lib/util/loading/factory.cc (modified) (4 diffs)

trunk/src/lib/util/loading/factory.cc

@@ -19 +19 @@
 //#include "shell_command.h"
 
-using namespace std;
+
 
 //SHELL_COMMAND(create, Factory, fabricate);
@@ -117 +117 @@
   if (factory != Factory::factoryList->end())
   {
-    PRINTF(2)("Create a new Object of type %s\n", (*factory)->getName());
+    PRINTF(2)("Create a new Object of type %s\n", (*factory)->getCName());
     return (*factory)->fabricateObject(root);
   }
@@ -145 +145 @@
   if (factory != Factory::factoryList->end())
   {
-    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getName());
+    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getCName());
     return (*factory)->fabricateObject(NULL);
   }
@@ -173 +173 @@
   if (factory != Factory::factoryList->end())
   {
-    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getName());
+    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getCName());
     return (*factory)->fabricateObject(NULL);
   }