From 5363a63de0f0ba33a856aaa1d74f984e8f29d130 Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Sat, 17 Jun 2017 00:52:02 -0400
Subject: [PATCH] g++ sometimes chokes on parsing certain combinations of
 characters because of disambiguation rules

---
 single/sol/sol.hpp                   | 38 ++++++++++++++--------------
 sol/container_usertype_metatable.hpp | 18 ++++++-------
 sol/function_types_stateless.hpp     | 14 +++++-----
 sol/function_types_templated.hpp     |  2 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp
index 8d137cae..761afa5a 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-06-17 04:42:58.829253 UTC
-// This header was generated with sol v2.17.5 (revision 11916a7)
+// Generated 2017-06-17 04:51:25.897832 UTC
+// This header was generated with sol v2.17.5 (revision b811e73)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -9185,7 +9185,7 @@ namespace sol {
 #ifdef __clang__
 			return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
 #else
-			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), &function_detail::call_wrapper_entry<F, fx>>(L);
+			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), (&function_detail::call_wrapper_entry<F, fx>)>(L);
 #endif // fuck you clang :c
 		}
 
@@ -9240,7 +9240,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -9267,7 +9267,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -9301,7 +9301,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -9333,7 +9333,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -9355,7 +9355,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -9383,7 +9383,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -9410,7 +9410,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -12867,39 +12867,39 @@ namespace sol {
 		}
 
 		static int add_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_add_call), &real_add_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_add_call), (&real_add_call)>(L);
 		}
 
 		static int insert_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_insert_call), &real_insert_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_insert_call), (&real_insert_call)>(L);
 		}
 
 		static int clear_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_clear_call), &real_clear_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_clear_call), (&real_clear_call)>(L);
 		}
 
 		static int find_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_find_call), &real_find_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_find_call), (&real_find_call)>(L);
 		}
 
 		static int length_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_length_call), &real_length_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_length_call), (&real_length_call)>(L);
 		}
 
 		static int pairs_next_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_pairs_next_call), &real_pairs_next_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_pairs_next_call), (&real_pairs_next_call)>(L);
 		}
 
 		static int pairs_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_pairs_call), &real_pairs_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_pairs_call), (&real_pairs_call)>(L);
 		}
 
 		static int index_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_index_call), &real_index_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
 		}
 
 		static int new_index_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_new_index_call), &real_new_index_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
 		}
 	};
 
diff --git a/sol/container_usertype_metatable.hpp b/sol/container_usertype_metatable.hpp
index 8f223d9e..c0cd7c63 100644
--- a/sol/container_usertype_metatable.hpp
+++ b/sol/container_usertype_metatable.hpp
@@ -457,39 +457,39 @@ namespace sol {
 		}
 
 		static int add_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_add_call), &real_add_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_add_call), (&real_add_call)>(L);
 		}
 
 		static int insert_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_insert_call), &real_insert_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_insert_call), (&real_insert_call)>(L);
 		}
 
 		static int clear_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_clear_call), &real_clear_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_clear_call), (&real_clear_call)>(L);
 		}
 
 		static int find_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_find_call), &real_find_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_find_call), (&real_find_call)>(L);
 		}
 
 		static int length_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_length_call), &real_length_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_length_call), (&real_length_call)>(L);
 		}
 
 		static int pairs_next_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_pairs_next_call), &real_pairs_next_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_pairs_next_call), (&real_pairs_next_call)>(L);
 		}
 
 		static int pairs_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_pairs_call), &real_pairs_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_pairs_call), (&real_pairs_call)>(L);
 		}
 
 		static int index_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_index_call), &real_index_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
 		}
 
 		static int new_index_call(lua_State*L) {
-			return detail::typed_static_trampoline<decltype(&real_new_index_call), &real_new_index_call>(L);
+			return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
 		}
 	};
 
diff --git a/sol/function_types_stateless.hpp b/sol/function_types_stateless.hpp
index 20239d99..dc3ad019 100644
--- a/sol/function_types_stateless.hpp
+++ b/sol/function_types_stateless.hpp
@@ -38,7 +38,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -65,7 +65,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -99,7 +99,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -131,7 +131,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -153,7 +153,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -181,7 +181,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
@@ -208,7 +208,7 @@ namespace sol {
 			}
 
 			static int call(lua_State* L) {
-				return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
+				return detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
 			}
 
 			int operator()(lua_State* L) {
diff --git a/sol/function_types_templated.hpp b/sol/function_types_templated.hpp
index 3c72f4b6..cca439df 100644
--- a/sol/function_types_templated.hpp
+++ b/sol/function_types_templated.hpp
@@ -107,7 +107,7 @@ namespace sol {
 #ifdef __clang__
 			return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
 #else
-			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), &function_detail::call_wrapper_entry<F, fx>>(L);
+			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), (&function_detail::call_wrapper_entry<F, fx>)>(L);
 #endif // fuck you clang :c
 		}