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

(part 2 oops..) 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

note: should use an awk script for "#elif BOOST_PP" -> "#else if BOOST_PP" transform ..

Conflicts:
	mp/src/thirdparty/boost/functional/overloaded_function.hpp
	mp/src/thirdparty/boost/functional/overloaded_function/detail/base.hpp
	mp/src/thirdparty/boost/local_function/aux_/function.hpp
	mp/src/thirdparty/boost/mpl/apply_wrap.hpp
	mp/src/thirdparty/boost/mpl/aux_/advance_backward.hpp
	mp/src/thirdparty/boost/mpl/aux_/advance_forward.hpp
	mp/src/thirdparty/boost/mpl/bind.hpp
	mp/src/thirdparty/boost/numeric/conversion/detail/numeric_cast_traits.hpp
	mp/src/thirdparty/boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp
	mp/src/thirdparty/boost/spirit/home/phoenix/statement/detail/catch_eval.hpp
	mp/src/thirdparty/boost/variant/detail/substitute.hpp
This commit is contained in:
Dexter 2013-10-30 01:00:11 +00:00 committed by squeek
parent 4babbaf7d8
commit 91b9020f9f
12 changed files with 2317 additions and 2317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mp/src/thirdparty/boost/functional/overloaded_function.hpp vendored
View File

@ -107,7 +107,7 @@
# endif // #include guard
#elif BOOST_PP_ITERATION_DEPTH() == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1
# define BOOST_FUNCTIONAL_overloads \
/* iterate as OVERLOADS, OVERLOADS-1, OVERLOADS-2, ... */ \
/* (add 2 because iteration started from 2 to MAX) */ \

2
mp/src/thirdparty/boost/functional/overloaded_function/detail/base.hpp vendored
View File

@ -54,7 +54,7 @@ class base {}; // Empty template cannot be used directly (only its spec).
# endif // #include guard
#elif BOOST_PP_ITERATION_DEPTH() == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1
# define BOOST_FUNCTIONAL_DETAIL_arity BOOST_PP_FRAME_ITERATION(1)
template<

4
mp/src/thirdparty/boost/local_function/aux_/function.hpp vendored
View File

@ -225,7 +225,7 @@ BOOST_TYPEOF_REGISTER_TEMPLATE(boost::local_function::aux::function,
# endif // #include guard
#elif BOOST_PP_ITERATION_DEPTH() == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1
# define BOOST_LOCAL_FUNCTION_AUX_arity BOOST_PP_FRAME_ITERATION(1)
# define BOOST_PP_ITERATION_PARAMS_2 \
(3, (0, BOOST_LOCAL_FUNCTION_AUX_arity, \
@ -233,7 +233,7 @@ BOOST_TYPEOF_REGISTER_TEMPLATE(boost::local_function::aux::function,
# include BOOST_PP_ITERATE() // Iterate over default params count.
# undef BOOST_LOCAL_FUNCTION_AUX_arity
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
# define BOOST_LOCAL_FUNCTION_AUX_defaults BOOST_PP_FRAME_ITERATION(2)
template<

2
mp/src/thirdparty/boost/mpl/apply_wrap.hpp vendored
View File

@ -174,7 +174,7 @@ struct BOOST_PP_CAT(apply_wrap,i_)<AUX778076_APPLY_WRAP_SPEC_PARAMS(i_, int)>
///// iteration, depth == 2
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
# define j_ BOOST_PP_FRAME_ITERATION(2)

2
mp/src/thirdparty/boost/mpl/aux_/advance_backward.hpp vendored
View File

@ -114,7 +114,7 @@ struct advance_backward< BOOST_PP_FRAME_ITERATION(1) >
///// iteration, depth == 2
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
# define AUX778076_ITER_0 BOOST_PP_CAT(iter,BOOST_PP_DEC(BOOST_PP_FRAME_ITERATION(2)))
# define AUX778076_ITER_1 BOOST_PP_CAT(iter,BOOST_PP_FRAME_ITERATION(2))

2
mp/src/thirdparty/boost/mpl/aux_/advance_forward.hpp vendored
View File

@ -113,7 +113,7 @@ struct advance_forward< BOOST_PP_FRAME_ITERATION(1) >
///// iteration, depth == 2
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
# define AUX778076_ITER_0 BOOST_PP_CAT(iter,BOOST_PP_DEC(BOOST_PP_FRAME_ITERATION(2)))
# define AUX778076_ITER_1 BOOST_PP_CAT(iter,BOOST_PP_FRAME_ITERATION(2))

2
mp/src/thirdparty/boost/mpl/bind.hpp vendored
View File

@ -531,7 +531,7 @@ struct bind_chooser<i_>
///// iteration, depth == 2
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
# define j_ BOOST_PP_FRAME_ITERATION(2)
# if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)

4
mp/src/thirdparty/boost/numeric/conversion/detail/numeric_cast_traits.hpp vendored
View File

@ -108,12 +108,12 @@ namespace boost { namespace numeric {
#undef BOOST_NUMERIC_CONVERSION_SEQ_A
#undef BOOST_NUMERIC_CONVERSION_SEQ_B
#elif BOOST_PP_ITERATION_DEPTH() == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1
#define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(BOOST_NUMERIC_CONVERSION_SEQ_B())), <boost/numeric/conversion/detail/numeric_cast_traits.hpp>))
#include BOOST_PP_ITERATE()
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
//! Generate default traits for the specified source and target.
#define BOOST_NUMERIC_CONVERSION_A BOOST_PP_FRAME_ITERATION(1)

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

@ -63,7 +63,7 @@ BOOST_PP_IF(N, A0, void)(* target(R (*)(BOOST_PP_ENUM_PARAMS_Z(1, N, A))) )()
# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>))
# include BOOST_PP_ITERATE()
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
# if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
&& BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
# line BOOST_PP_LINE(__LINE__, target.hpp(pointers-to-members))

4
mp/src/thirdparty/boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp vendored
View File

@ -57,7 +57,7 @@ namespace boost { namespace phoenix {
#endif
#elif BOOST_PP_ITERATION_DEPTH() == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1
#define PHOENIX_ITERATION BOOST_PP_ITERATION()
@ -87,7 +87,7 @@ namespace boost { namespace phoenix {
#undef PHOENIX_ITERATION
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
#define PHOENIX_ITERATION BOOST_PP_ITERATION()

4
mp/src/thirdparty/boost/spirit/home/phoenix/statement/detail/catch_eval.hpp vendored
View File

@ -41,7 +41,7 @@ namespace boost { namespace phoenix {
#endif
#elif BOOST_PP_ITERATION_DEPTH() == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1
#define PHOENIX_ITERATION BOOST_PP_ITERATION()
@ -65,7 +65,7 @@ namespace boost { namespace phoenix {
#undef PHOENIX_ITERATION
#elif BOOST_PP_ITERATION_DEPTH() == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2
#define PHOENIX_ITERATION BOOST_PP_ITERATION()

2
mp/src/thirdparty/boost/variant/detail/substitute.hpp vendored
View File

@ -151,7 +151,7 @@ struct substitute<
///// iteration, depth == 1
#elif BOOST_PP_ITERATION_DEPTH() == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1
#define i BOOST_PP_FRAME_ITERATION(1)
#if i > 0