Skip to content

Commit

Permalink
xrScriptEngine: fix luabind's call_member call on GCC
Browse files Browse the repository at this point in the history
  • Loading branch information
@a1batross @Zegeri
a1batross authored and Zegeri committed Sep 16, 2018
1 parent 9c84cce commit b6be30b
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/xrScriptEngine/ScriptExportMacros.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
{ \
try \
{ \
return call_member<ret_type>(this, #v_func_name); \
return luabind::call_member<ret_type>(this, #v_func_name); \
} \
CAST_FAILED(v_func_name, ret_type) \
catch (...) { return ((ret_type)(0)); } \
Expand All @@ -76,7 +76,7 @@
{ \
try \
{ \
return call_member<ret_type>(this, #v_func_name, p1); \
return luabind::call_member<ret_type>(this, #v_func_name, p1); \
} \
CAST_FAILED(v_func_name, ret_type) \
catch (...) { return ((ret_type)(0)); } \
Expand All @@ -87,7 +87,7 @@
}
#else // DEBUG
#define DEFINE_LUA_WRAPPER_CONST_METHOD_1(v_func_name, ret_type, t1) \
virtual ret_type v_func_name(t1 p1) const { return call_member<ret_type>(this, #v_func_name, p1); } \
virtual ret_type v_func_name(t1 p1) const { return luabind::call_member<ret_type>(this, #v_func_name, p1); } \
static ret_type v_func_name##_static(const inherited* ptr, t1 p1) \
{ \
return ptr->self_type::inherited::v_func_name(p1); \
Expand All @@ -99,7 +99,7 @@
{ \
try \
{ \
call_member<void>(this, #v_func_name); \
luabind::call_member<void>(this, #v_func_name); \
} \
catch (...) \
{ \
Expand All @@ -111,7 +111,7 @@
{ \
try \
{ \
call_member<void>(this, #v_func_name, p1); \
luabind::call_member<void>(this, #v_func_name, p1); \
} \
catch (...) \
{ \
Expand All @@ -123,7 +123,7 @@
{ \
try \
{ \
call_member<void>(this, #v_func_name, p1, p2); \
luabind::call_member<void>(this, #v_func_name, p1, p2); \
} \
catch (...) \
{ \
Expand All @@ -135,7 +135,7 @@
{ \
try \
{ \
call_member<void>(this, #v_func_name, p1, p2, p3); \
luabind::call_member<void>(this, #v_func_name, p1, p2, p3); \
} \
catch (...) \
{ \
Expand All @@ -151,7 +151,7 @@
{ \
try \
{ \
call_member<void>(this, #v_func_name, p1, p2, p3, p4); \
luabind::call_member<void>(this, #v_func_name, p1, p2, p3, p4); \
} \
catch (...) \
{ \
Expand All @@ -167,7 +167,7 @@
{ \
try \
{ \
return call_member<ret_type>(this, #v_func_name); \
return luabind::call_member<ret_type>(this, #v_func_name); \
} \
CAST_FAILED(v_func_name, ret_type) \
catch (...) { return ((ret_type)(0)); } \
Expand All @@ -178,7 +178,7 @@
{ \
try \
{ \
return call_member<ret_type>(this, #v_func_name, p1); \
return luabind::call_member<ret_type>(this, #v_func_name, p1); \
} \
CAST_FAILED(v_func_name, ret_type) \
catch (...) { return ((ret_type)(0)); } \
Expand All @@ -189,7 +189,7 @@
{ \
try \
{ \
return call_member<ret_type>(this, #v_func_name, p1, p2); \
return luabind::call_member<ret_type>(this, #v_func_name, p1, p2); \
} \
CAST_FAILED(v_func_name, ret_type) \
catch (...) { return ((ret_type)(0)); } \
Expand All @@ -204,7 +204,7 @@
{ \
try \
{ \
return call_member<ret_type>(this, #v_func_name, p1, p2, p3); \
return luabind::call_member<ret_type>(this, #v_func_name, p1, p2, p3); \
} \
CAST_FAILED(v_func_name, ret_type) \
catch (...) { return ((ret_type)(0)); } \
Expand All @@ -219,7 +219,7 @@
{ \
try \
{ \
return call_member<ret_type>(this, #v_func_name, p1, p2, p3, p4); \
return luabind::call_member<ret_type>(this, #v_func_name, p1, p2, p3, p4); \
} \
CAST_FAILED(v_func_name, ret_type) \
catch (...) { return ((ret_type)(0)); } \
Expand Down

0 comments on commit b6be30b

Please sign in to comment.