summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/sol2/sol/object.hpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2020-07-28 20:33:25 -0400
committer AJR <ajrhacker@users.noreply.github.com>2020-07-28 20:33:25 -0400
commitdcbee7cda6faea688605ed24c2548187cb55f60a (patch)
treeb1fa54bbf460a25d2f89048dbb09ad3d145aaf88 /3rdparty/sol2/sol/object.hpp
parentab37462a09de15accbca6e5a4b66fb9597daa4f9 (diff)
Fix SOL2 build on GCC 10.2 by working around overload resolution problem
Diffstat (limited to '3rdparty/sol2/sol/object.hpp')
-rw-r--r--3rdparty/sol2/sol/object.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdparty/sol2/sol/object.hpp b/3rdparty/sol2/sol/object.hpp
index 3b69a6675ac..ab6e41854a1 100644
--- a/3rdparty/sol2/sol/object.hpp
+++ b/3rdparty/sol2/sol/object.hpp
@@ -43,7 +43,7 @@ namespace sol {
template <typename T, typename R = reference, bool should_pop = !std::is_base_of<stack_reference, R>::value, typename... Args>
R make_reference(lua_State* L, Args&&... args) {
- int backpedal = stack::push<T>(L, std::forward<Args>(args)...);
+ int backpedal = stack::push_specific<T>(L, std::forward<Args>(args)...);
R r = stack::get<R>(L, -backpedal);
if (should_pop) {
lua_pop(L, backpedal);
@@ -99,7 +99,7 @@ namespace sol {
basic_object(lua_State* L, int index = -1) noexcept : base_t(L, index) {}
basic_object(lua_State* L, ref_index index) noexcept : base_t(L, index) {}
template <typename T, typename... Args>
- basic_object(lua_State* L, in_place_type_t<T>, Args&&... args) noexcept : basic_object(std::integral_constant<bool, !std::is_base_of<stack_reference, base_t>::value>(), L, -stack::push<T>(L, std::forward<Args>(args)...)) {}
+ basic_object(lua_State* L, in_place_type_t<T>, Args&&... args) noexcept : basic_object(std::integral_constant<bool, !std::is_base_of<stack_reference, base_t>::value>(), L, -stack::push_specific<T>(L, std::forward<Args>(args)...)) {}
template <typename T, typename... Args>
basic_object(lua_State* L, in_place_t, T&& arg, Args&&... args) noexcept : basic_object(L, in_place<T>, std::forward<T>(arg), std::forward<Args>(args)...) {}
basic_object& operator=(const basic_object&) = default;