From 4cdcac200106d90122d9ce01ed9d924bcd6cfe0a Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Thu, 7 Apr 2016 05:43:44 -0400
Subject: [PATCH] Ensure compilation for 2 more function types

---
 sol/function_types_templated.hpp | 2 +-
 test_functions.cpp               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sol/function_types_templated.hpp b/sol/function_types_templated.hpp
index a209154e..d701f005 100644
--- a/sol/function_types_templated.hpp
+++ b/sol/function_types_templated.hpp
@@ -31,7 +31,7 @@ namespace function_detail {
         typedef meta::bind_traits<meta::Unqualified<F>> traits_type;
         typedef typename traits_type::args_type args_type;
         typedef meta::tuple_types<typename traits_type::return_type> return_type;
-        return stack::call_into_lua(return_type(), args_type(), fx, L, 1);
+        return stack::call_into_lua(return_type(), args_type(), L, 1, fx);
     }
 
     template <typename R, typename V, V, typename T>
diff --git a/test_functions.cpp b/test_functions.cpp
index f6036f4e..33c5151e 100644
--- a/test_functions.cpp
+++ b/test_functions.cpp
@@ -467,6 +467,8 @@ TEST_CASE("functions/all-kinds", "Register all kinds of functions, make sure the
     lua.set_function("k", &test_2::a);
     lua.set_function("l", sol::c_call<decltype(&test_1::a), &test_1::a>);
     lua.set_function("m", &test_2::a, &t2);
+    lua.set_function("n", sol::c_call<decltype(&test_1::x_bark), &test_1::x_bark>);
+    lua.set_function("o", sol::c_call<decltype(test_1::x_bark), test_1::x_bark>);
 
     lua.script(R"(
 o1 = test_1.new()