Changeset 7221 in orxonox.OLD for trunk/src/lib/util/executor/executor_specials.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/lib/util/executor/executor_specials.h (modified) (1 diff)

trunk/src/lib/util/executor/executor_specials.h

@@ -60 +60 @@
      * @param loadString ignored in this case
      */
-    virtual void execute(BaseObject* object, const void* parameters = NULL)
+    virtual void execute(BaseObject* object, const std::string& = "")
     {
       if (object != NULL && this->element != NULL)