Added support for VS 12 compiler

AdUki · May 31, 2014 · 4b86199 · 4b86199
1 parent b121f44
commit 4b86199
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/include/LuaFunctor.h b/include/LuaFunctor.h
@@ -75,7 +75,7 @@ namespace lua {
         ///
         /// @param luaState     Pointer of Lua state
         int call(lua_State* luaState) {
-            traits::apply(function, stack::get_and_pop<Args...>(luaState, nullptr, 2));
+            traits::apply_no_ret(function, stack::get_and_pop<Args...>(luaState, nullptr, 2));
             return 0;
         }
     };

diff --git a/include/LuaStack.h b/include/LuaStack.h
@@ -43,7 +43,6 @@ namespace lua { namespace stack {
         return sizeof...(Args);
     }
 
-    template<>
     inline int push(lua_State* luaState) { return 0; }
 
     template<>

diff --git a/include/Traits.h b/include/Traits.h
@@ -75,13 +75,13 @@ namespace lua { namespace traits {
     }
 
     template<class ... Args>
-    void apply(std::function<void(Args...)> pf, const std::tuple<Args...>&  tup)
+    void apply_no_ret(std::function<void(Args...)> pf, const std::tuple<Args...>&  tup)
     {
         apply_helper(pf, typename make_indexes<Args...>::type(), std::tuple<Args...>(tup));
     }
 
     template<class ... Args>
-    void apply(std::function<void(Args...)> pf, std::tuple<Args...>&&  tup)
+    void apply_no_ret(std::function<void(Args...)> pf, std::tuple<Args...>&&  tup)
     {
         apply_helper(pf, typename make_indexes<Args...>::type(), std::forward<std::tuple<Args...>>(tup));
     }

diff --git a/test/main.cpp b/test/main.cpp
@@ -15,8 +15,18 @@ void runTest(const std::string& filename)
     printf("#####################################\n");
     printf("##  Running test: %s\n", filename.c_str());
     printf("#####################################\n\n");
-
-    if (system(std::string("./" + filename).c_str()) == 0)
+
+	// TODO: search for executables
+
+#ifdef WIN32
+	// NOTE: add your own directory according to project
+	std::string prefix = "Debug\\";
+	std::string suffix = ".exe";
+#else
+	std::string prefix = "./";
+	std::string suffix = "";
+#endif
+	if (system(std::string(prefix + filename + suffix).c_str()) == 0)
         printf("Test %s OK...\n\n", filename.c_str());
     else {
         printf("Test %s FAILED!\n\n", filename.c_str());