fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2024-11-29 15:41:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

potential luabind fix for gcc

Browse source 
Conflicts:
	mp/src/thirdparty/luabind/detail/call_function.hpp
	mp/src/thirdparty/luabind/detail/call_member.hpp
	mp/src/thirdparty/luabind/wrapper_base.hpp
This commit is contained in:
Dexter 2013-10-30 02:13:31 +00:00 committed by squeek
parent f8b8321865
commit 1609c58888
3 changed files with 999 additions and 996 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mp/src/thirdparty/luabind/detail/call_function.hpp vendored
View file

@ -323,7 +323,8 @@ namespace luabind
#endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED #endif // LUABIND_CALL_FUNCTION_HPP_INCLUDED
#elif BOOST_PP_ITERATION_FLAGS() == 1 #else // FF dexter gcc fix
#if BOOST_PP_ITERATION_FLAGS() == 1
#define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
#define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
@ -438,6 +439,6 @@ namespace luabind
#undef LUABIND_OPERATOR_PARAMS #undef LUABIND_OPERATOR_PARAMS
#undef LUABIND_TUPLE_PARAMS #undef LUABIND_TUPLE_PARAMS
#endif
#endif #endif

5
mp/src/thirdparty/luabind/detail/call_member.hpp vendored
View file

@ -316,7 +316,8 @@ namespace luabind
#endif // LUABIND_CALL_MEMBER_HPP_INCLUDED #endif // LUABIND_CALL_MEMBER_HPP_INCLUDED
#elif BOOST_PP_ITERATION_FLAGS() == 1 #else // FF dexter gcc fix
#if BOOST_PP_ITERATION_FLAGS() == 1
#define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
#define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
@ -358,6 +359,6 @@ namespace luabind
#undef LUABIND_OPERATOR_PARAMS #undef LUABIND_OPERATOR_PARAMS
#undef LUABIND_TUPLE_PARAMS #undef LUABIND_TUPLE_PARAMS
#endif
#endif #endif

5
mp/src/thirdparty/luabind/wrapper_base.hpp vendored
View file

@ -89,7 +89,8 @@ namespace luabind
#endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED #endif // LUABIND_WRAPPER_BASE_HPP_INCLUDED
#elif BOOST_PP_ITERATION_FLAGS() == 1 #else // FF dexter gcc fix
#if BOOST_PP_ITERATION_FLAGS() == 1
#define LUABIND_TUPLE_PARAMS(z, n, data) const A##n * #define LUABIND_TUPLE_PARAMS(z, n, data) const A##n *
#define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n #define LUABIND_OPERATOR_PARAMS(z, n, data) const A##n & a##n
@ -142,7 +143,6 @@ namespace luabind
#undef LUABIND_CALL_MEMBER_NAME #undef LUABIND_CALL_MEMBER_NAME
#undef LUABIND_OPERATOR_PARAMS #undef LUABIND_OPERATOR_PARAMS
#undef LUABIND_TUPLE_PARAMS #undef LUABIND_TUPLE_PARAMS
#else // free call_member forwardarding functions #else // free call_member forwardarding functions
#define N BOOST_PP_ITERATION() #define N BOOST_PP_ITERATION()
@ -188,3 +188,4 @@ namespace luabind
#undef N #undef N
#endif #endif
#endif