From f4f166f88c3033affb63f226aa5d5e7e8e1e5034 Mon Sep 17 00:00:00 2001
From: Orfeas Zafeiris <orfeaz@gmail.com>
Date: Wed, 30 May 2018 08:57:44 +0300
Subject: [PATCH 1/3] Fix x64 compilation error in usertype tests

---
 tests/test_usertypes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_usertypes.cpp b/tests/test_usertypes.cpp
index be06a708..429fd7dd 100644
--- a/tests/test_usertypes.cpp
+++ b/tests/test_usertypes.cpp
@@ -304,7 +304,7 @@ struct matrix_xi {
 };
 template <typename SelfType>
 struct alignas(16) weird_aligned_wrapper {
-	void operator()(SelfType& self, sol::object param) const {
+	void operator()(SelfType&, sol::object param) const {
 	}
 	std::function<void(SelfType&, float)> lambda;
 };

From efef730ee8e23d8e10dfd56fe9d9442f5e216187 Mon Sep 17 00:00:00 2001
From: Orfeas Zafeiris <orfeaz@gmail.com>
Date: Wed, 30 May 2018 08:58:18 +0300
Subject: [PATCH 2/3] Fix compilation issue with alignment (possibly)

---
 sol/types.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sol/types.hpp b/sol/types.hpp
index c0a08284..f0d95dce 100644
--- a/sol/types.hpp
+++ b/sol/types.hpp
@@ -309,7 +309,7 @@ namespace sol {
 	struct user {
 		U value;
 
-		user(U x)
+		user(U&& x)
 		: value(std::forward<U>(x)) {
 		}
 		operator std::add_pointer_t<std::remove_reference_t<U>>() {

From 3fe08ec2c1c2adf8aef686ab9fba187c997a62d6 Mon Sep 17 00:00:00 2001
From: Orfeas Zafeiris <orfeaz@gmail.com>
Date: Sun, 3 Jun 2018 02:22:07 +0300
Subject: [PATCH 3/3] Fix header inclusion order

---
 tests/test_sol.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_sol.hpp b/tests/test_sol.hpp
index f754ba60..7ee6431e 100644
--- a/tests/test_sol.hpp
+++ b/tests/test_sol.hpp
@@ -36,14 +36,14 @@
 #endif // SOL_DEFAULT_PASS_ON_ERROR
 */
 
+#include <iostream>
+#include <cstdlib>
+
 #ifdef TEST_SINGLE
 #include <sol_forward.hpp>
 #endif // Single
 #include <sol.hpp>
 
-#include <iostream>
-#include <cstdlib>
-
 struct test_stack_guard {
 	lua_State* L;
 	int& begintop;