Changeset 9869 in orxonox.OLD for trunk/src/lib/script_engine/script_method.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/script_engine/script_method.h (modified) (3 diffs)

trunk/src/lib/script_engine/script_method.h

@@ -9 +9 @@
 #include <vector>
 
-#include "executor/executor_lua.h"
-
+#include "executor_lua_state.h"
+#include "executor/executor_member.h"
 
 class ScriptMethod
@@ -18 +18 @@
   ~ScriptMethod();
 
-  ScriptMethod* addMethod(const std::string& methodName, const Executor& executor);
+  ScriptMethod* addMethod(const std::string& methodName, const Executor<lua_State*>& executor);
 
   unsigned int size() const { return methods.size(); };
 
   const std::string& name(unsigned int methodNumber) const { return methods[methodNumber].name; };
-  const Executor* executor(unsigned int methodNumber) const { return methods[methodNumber].executor; };
+  const Executor<lua_State*>* executor(unsigned int methodNumber) const { return methods[methodNumber].executor; };
 
 
@@ -29 +29 @@
   struct Method
   {
-    Method(const std::string& name, const Executor& executor);
-    std::string    name;
-    Executor*      executor;
+    Method(const std::string& name, const Executor<lua_State*>& executor);
+    std::string             name;
+    Executor<lua_State*>*   executor;
   };