Changeset 7221 in orxonox.OLD for trunk/src/util/object_manager.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/util/object_manager.h (modified) (2 diffs)

trunk/src/util/object_manager.h

@@ -76 +76 @@
 
   void toList (WorldEntity* entity, OM_LIST omList = OM_DEFAULT_LIST);
-  void toList (WorldEntity* entity, const char* omList);
+  void toList (WorldEntity* entity, const std::string& omList);
 
 
@@ -85 +85 @@
 
   void debug(OM_LIST omList, unsigned int level = 0) const;
-  void debug(const char* listName = NULL, unsigned int level = 0);
+  void debug(const std::string& listName = "", unsigned int level = 0);
 
-  static OM_LIST StringToOMList(const char* listName);
+  static OM_LIST StringToOMList(const std::string& listName);
   static const char* OMListToString(OM_LIST omList);