Fixed issue #4

tomaka · Mar 1, 2014 · ee75dd8 · ee75dd8
1 parent 5485b01
commit ee75dd8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/LuaContext.hpp b/include/LuaContext.hpp
@@ -1855,10 +1855,10 @@ struct LuaContext::Pusher<TReturnType (TParameters...)>
 			return lua_error(state);
 		}
 
-		boost::optional<typename Reader<std::tuple<TParameters...>>::ReturnType> parameters;
+		std::unique_ptr<typename Reader<std::tuple<TParameters...>>::ReturnType> parameters;
 		// reading parameters from the stack
 		try {
-			parameters = Reader<std::tuple<TParameters...>>::readSafe(*me, -argumentsCount, argumentsCount);
+			parameters.reset(new typename Reader<std::tuple<TParameters...>>::ReturnType(Reader<std::tuple<TParameters...>>::readSafe(*me, -argumentsCount, argumentsCount)));
 
 		} catch (const WrongTypeException& ex) {
 			// wrong parameter type, using lua_error to return an error

diff --git a/tests/functions_write.cpp b/tests/functions_write.cpp
@@ -37,7 +37,7 @@ TEST(FunctionsWrite, ConstRefParameters)
 	EXPECT_EQ(4, context.executeCode<int>("return f('test')"));
 }
 
-/*TEST(FunctionsWrite, VariantParameters)
+TEST(FunctionsWrite, VariantParameters)
 {
 	LuaContext context;
 
@@ -47,7 +47,7 @@ TEST(FunctionsWrite, ConstRefParameters)
 
 	EXPECT_EQ(1, context.executeCode<int>("return f(foo)"));
 	EXPECT_EQ(0, context.executeCode<int>("return f(3)"));
-}*/
+}
 
 TEST(FunctionsWrite, FunctionObjects) {
 	struct Foo {