Skip to content

Commit 4fd4f98

Browse files
authored
Merge pull request #141 from adriengivry/fix/sol2_msvc_16_7_no_except_bug
Fixing VS2019 MSVC16.7 no_except bug with sol2
2 parents 270cdd7 + 7080a4c commit 4fd4f98

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: Dependencies/lua/include/sol.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17020,7 +17020,7 @@ namespace sol {
1702017020
typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
1702117021
typedef meta::bind_traits<function_type> traits_type;
1702217022

17023-
static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
17023+
static int real_call(lua_State* L) /* noexcept(traits_type::is_noexcept) */ {
1702417024
auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
1702517025
function_type* fx = udata.first;
1702617026
return call_detail::call_wrapped<void, true, false>(L, fx);
@@ -17155,7 +17155,7 @@ namespace sol {
1715517155
typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
1715617156
typedef lua_bind_traits<function_type> traits_type;
1715717157

17158-
static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
17158+
static int real_call(lua_State* L) /* noexcept(traits_type::is_noexcept) */ {
1715917159
// Layout:
1716017160
// idx 1...n: verbatim data of member variable pointer
1716117161
function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));

0 commit comments

Comments
 (0)