fortressforever
/
fortressforever-2013
mirror of https://github.com/fortressforever/fortressforever-2013.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for boost on gcc, #elif works differently (more correct) and breaks boost http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36453 

the two .sh files got windows newlines, so fix those too while we're here

Conflicts:
	mp/src/thirdparty/boost/parameter/aux_/python/invoker_iterate.hpp
	mp/src/thirdparty/boost/python/detail/result.hpp
	mp/src/thirdparty/boost/python/detail/target.hpp
This commit is contained in:
Dexter 2013-10-30 00:47:19 +00:00 committed by squeek
parent 66d119efa5
commit 4babbaf7d8
3 changed files with 314 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mp/src/thirdparty/boost/parameter/aux_/python/invoker_iterate.hpp vendored
View File

@ -28,13 +28,13 @@
#if BOOST_PP_ITERATION_FLAGS() == 1 #if BOOST_PP_ITERATION_FLAGS() == 1
template <class M, class R, class Args> template <class M, class R, class Args>
struct invoker<N, M, R, Args> struct invoker<N, M, R, Args>
#elif BOOST_PP_ITERATION_FLAGS() == 2 #else if BOOST_PP_ITERATION_FLAGS() == 2
template <class T, class R, class Args> template <class T, class R, class Args>
struct call_invoker<N, T, R, Args> struct call_invoker<N, T, R, Args>
#elif BOOST_PP_ITERATION_FLAGS() == 3 #else if BOOST_PP_ITERATION_FLAGS() == 3
template <class T, class Args> template <class T, class Args>
struct init_invoker<N, T, Args> struct init_invoker<N, T, Args>
#elif BOOST_PP_ITERATION_FLAGS() == 4 #else if BOOST_PP_ITERATION_FLAGS() == 4
template <class M, class R, class T, class Args> template <class M, class R, class T, class Args>
struct member_invoker<N, M, R, T, Args> struct member_invoker<N, M, R, T, Args>
#endif #endif
@ -76,11 +76,11 @@ struct member_invoker<N, M, R, T, Args>
# endif # endif
, BOOST_PP_ENUM_BINARY_PARAMS(N, parameter::keyword<kw, >::get() = a) , BOOST_PP_ENUM_BINARY_PARAMS(N, parameter::keyword<kw, >::get() = a)
); );
#elif BOOST_PP_ITERATION_FLAGS() == 2 #else if BOOST_PP_ITERATION_FLAGS() == 2
self( self(
BOOST_PP_ENUM_BINARY_PARAMS(N, parameter::keyword<kw, >::get() = a) BOOST_PP_ENUM_BINARY_PARAMS(N, parameter::keyword<kw, >::get() = a)
); );
#elif BOOST_PP_ITERATION_FLAGS() == 3 #else if BOOST_PP_ITERATION_FLAGS() == 3
new T( new T(
BOOST_PP_ENUM_BINARY_PARAMS(N, parameter::keyword<kw, >::get() = a) BOOST_PP_ENUM_BINARY_PARAMS(N, parameter::keyword<kw, >::get() = a)
); );

4
mp/src/thirdparty/boost/python/detail/result.hpp vendored
View File

@ -106,13 +106,13 @@ boost::type<R>* result(R (*)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)), int = 0)
# undef N # undef N
/* --------------- pointers-to-members --------------- */ /* --------------- pointers-to-members --------------- */
#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER #else if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER
// Outer over cv-qualifiers // Outer over cv-qualifiers
# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>)) # define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>))
# include BOOST_PP_ITERATE() # include BOOST_PP_ITERATE()
#elif BOOST_PP_ITERATION_DEPTH() == 2 #else if BOOST_PP_ITERATION_DEPTH() == 2
# if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
&& BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
# line BOOST_PP_LINE(__LINE__, result.hpp(pointers-to-members)) # line BOOST_PP_LINE(__LINE__, result.hpp(pointers-to-members))

2
mp/src/thirdparty/boost/python/detail/target.hpp vendored
View File

@ -57,7 +57,7 @@ BOOST_PP_IF(N, A0, void)(* target(R (*)(BOOST_PP_ENUM_PARAMS_Z(1, N, A))) )()
# undef N # undef N
/* --------------- pointers-to-members --------------- */ /* --------------- pointers-to-members --------------- */
#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER #else if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER
// Outer over cv-qualifiers // Outer over cv-qualifiers
# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>)) # define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>))