From 3549bfa8ae365dfde7ddff560d73c1c90a9354d5 Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Wed, 30 Aug 2017 16:16:48 -0400
Subject: [PATCH] android fixes, wee?

---
 single/sol/sol.hpp    | 14 +++++++-------
 sol/usertype_core.hpp | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp
index 68964aa1..ecfbeb6e 100644
--- a/single/sol/sol.hpp
+++ b/single/sol/sol.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2017-08-28 13:38:08.132808 UTC
-// This header was generated with sol v2.18.1 (revision 043deed)
+// Generated 2017-08-30 20:09:44.279724 UTC
+// This header was generated with sol v2.18.1 (revision dea0ec0)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -14295,8 +14295,8 @@ namespace sol {
 
 		template <typename T>
 		inline int member_default_to_string(std::true_type, lua_State* L) {
-			std::string ts = stack::get<T>(L, 1).to_string();
-			return stack::push(L, std::move(ts));
+			decltype(auto) ts = stack::get<T>(L, 1).to_string();
+			return stack::push(L, std::forward<decltype(ts)>(ts));
 		}
 
 		template <typename T>
@@ -14306,9 +14306,9 @@ namespace sol {
 		
 		template <typename T>
 		inline int adl_default_to_string(std::true_type, lua_State* L) {
-			using std::to_string;
-			std::string ts = to_string(stack::get<T>(L, 1));
-			return stack::push(L, std::move(ts));
+			using namespace std;
+			decltype(auto) ts = to_string(stack::get<T>(L, 1));
+			return stack::push(L, std::forward<decltype(ts)>(ts));
 		}
 
 		template <typename T>
diff --git a/sol/usertype_core.hpp b/sol/usertype_core.hpp
index d8387c1f..a32d3358 100644
--- a/sol/usertype_core.hpp
+++ b/sol/usertype_core.hpp
@@ -46,8 +46,8 @@ namespace sol {
 
 		template <typename T>
 		inline int member_default_to_string(std::true_type, lua_State* L) {
-			std::string ts = stack::get<T>(L, 1).to_string();
-			return stack::push(L, std::move(ts));
+			decltype(auto) ts = stack::get<T>(L, 1).to_string();
+			return stack::push(L, std::forward<decltype(ts)>(ts));
 		}
 
 		template <typename T>
@@ -57,9 +57,9 @@ namespace sol {
 		
 		template <typename T>
 		inline int adl_default_to_string(std::true_type, lua_State* L) {
-			using std::to_string;
-			std::string ts = to_string(stack::get<T>(L, 1));
-			return stack::push(L, std::move(ts));
+			using namespace std;
+			decltype(auto) ts = to_string(stack::get<T>(L, 1));
+			return stack::push(L, std::forward<decltype(ts)>(ts));
 		}
 
 		template <typename T>