Changeset 9753 in orxonox.OLD

Timestamp:

Sep 17, 2006, 2:50:15 PM (18 years ago)

Author:

bensch

Message:

links and compiles again

Location:

branches/new_class_id/src/lib/util

Files:

• Makefile.am (modified) (1 diff)
• executor/executor_lua_state.cc (modified) (1 diff)
• executor/executor_lua_state.h (modified) (1 diff)

branches/new_class_id/src/lib/util/Makefile.am

@@ -7 +7 @@
 
 libORXexecutor_a_SOURCES = \
-                executor/executor.cc \
                 executor/executor_lua_state.cc \
                 executor/executor_substring.cc

branches/new_class_id/src/lib/util/executor/executor_lua_state.cc

@@ -23 +23 @@
 
 
-template<typename type> inline type fromLua(lua_State* state, int index) { type *obj = Lunar<type>::check(state, 1); lua_remove(state, 1); return obj; };
+template<typename type> type fromLua(lua_State* state, int index) { type *obj = Lunar<type>::check(state, 1); lua_remove(state, 1); return obj; };
+template<typename type> void toLua(lua_State* state, type value) { Lunar<type>::push(state, value, false); };
 
-template<typename type> void toLua(lua_State* state, type value) { Lunar<type>::push(state, value, false); };
-/** @see template<typename type> inline type fromLua(lua_State* state, int index) */
-template<> inline const std::string& fromLua<const std::string&>(lua_State* state, int index) { temp[index] = lua_tostring(state, index); return temp[index]; };
+template<> const std::string& fromLua<const std::string&>(lua_State* state, int index) { temp[index] = lua_tostring(state, index); return temp[index]; };

branches/new_class_id/src/lib/util/executor/executor_lua_state.h

@@ -52 +52 @@
 /** @see template<typename type> inline type fromLua(lua_State* state, int index) */
 template<> inline char fromLua<char>(lua_State* state, int index) { return (char)lua_tonumber(state, index); };
+/** @see template<typename type> inline type fromLua(lua_State* state, int index) */
+template<> const std::string& fromLua<const std::string&>(lua_State* state, int index);