fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2025-02-16 17:12:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

undo previous commits, gotta find a fix compatible with vc++

Browse source
This commit is contained in:
Dexter 2013-10-30 01:22:57 +00:00 committed by squeek
parent 91b9020f9f
commit df33b47da1
14 changed files with 24 additions and 24 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 # endif // #include guard
#else if BOOST_PP_ITERATION_DEPTH() == 1 #elif BOOST_PP_ITERATION_DEPTH() == 1
# define BOOST_FUNCTIONAL_overloads \ # define BOOST_FUNCTIONAL_overloads \
/* iterate as OVERLOADS, OVERLOADS-1, OVERLOADS-2, ... */ \ /* iterate as OVERLOADS, OVERLOADS-1, OVERLOADS-2, ... */ \
/* (add 2 because iteration started from 2 to MAX) */ \ /* (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 # endif // #include guard
#else if BOOST_PP_ITERATION_DEPTH() == 1 #elif BOOST_PP_ITERATION_DEPTH() == 1
# define BOOST_FUNCTIONAL_DETAIL_arity BOOST_PP_FRAME_ITERATION(1) # define BOOST_FUNCTIONAL_DETAIL_arity BOOST_PP_FRAME_ITERATION(1)
template< 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 # endif // #include guard
#else if BOOST_PP_ITERATION_DEPTH() == 1 #elif BOOST_PP_ITERATION_DEPTH() == 1
# define BOOST_LOCAL_FUNCTION_AUX_arity BOOST_PP_FRAME_ITERATION(1) # define BOOST_LOCAL_FUNCTION_AUX_arity BOOST_PP_FRAME_ITERATION(1)
# define BOOST_PP_ITERATION_PARAMS_2 \ # define BOOST_PP_ITERATION_PARAMS_2 \
(3, (0, BOOST_LOCAL_FUNCTION_AUX_arity, \ (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. # include BOOST_PP_ITERATE() // Iterate over default params count.
# undef BOOST_LOCAL_FUNCTION_AUX_arity # undef BOOST_LOCAL_FUNCTION_AUX_arity
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
# define BOOST_LOCAL_FUNCTION_AUX_defaults BOOST_PP_FRAME_ITERATION(2) # define BOOST_LOCAL_FUNCTION_AUX_defaults BOOST_PP_FRAME_ITERATION(2)
template< 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 ///// iteration, depth == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
# define j_ BOOST_PP_FRAME_ITERATION(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 ///// iteration, depth == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
# define AUX778076_ITER_0 BOOST_PP_CAT(iter,BOOST_PP_DEC(BOOST_PP_FRAME_ITERATION(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)) # 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 ///// iteration, depth == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
# define AUX778076_ITER_0 BOOST_PP_CAT(iter,BOOST_PP_DEC(BOOST_PP_FRAME_ITERATION(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)) # 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 ///// iteration, depth == 2
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
# define j_ BOOST_PP_FRAME_ITERATION(2) # define j_ BOOST_PP_FRAME_ITERATION(2)
# if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT) # 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_A
#undef BOOST_NUMERIC_CONVERSION_SEQ_B #undef BOOST_NUMERIC_CONVERSION_SEQ_B
#else if BOOST_PP_ITERATION_DEPTH() == 1 #elif 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>)) #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() #include BOOST_PP_ITERATE()
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
//! Generate default traits for the specified source and target. //! Generate default traits for the specified source and target.
#define BOOST_NUMERIC_CONVERSION_A BOOST_PP_FRAME_ITERATION(1) #define BOOST_NUMERIC_CONVERSION_A BOOST_PP_FRAME_ITERATION(1)

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>
#else if BOOST_PP_ITERATION_FLAGS() == 2 #elif 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>
#else if BOOST_PP_ITERATION_FLAGS() == 3 #elif 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>
#else if BOOST_PP_ITERATION_FLAGS() == 4 #elif 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)
); );
#else if BOOST_PP_ITERATION_FLAGS() == 2 #elif 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)
); );
#else if BOOST_PP_ITERATION_FLAGS() == 3 #elif 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 --------------- */
#else if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER #elif 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()
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif 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))

4
mp/src/thirdparty/boost/python/detail/target.hpp vendored
View file

@ -57,13 +57,13 @@ 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 --------------- */
#else if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER #elif 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>))
# include BOOST_PP_ITERATE() # include BOOST_PP_ITERATE()
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif 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__, target.hpp(pointers-to-members)) # 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 #endif
#else if BOOST_PP_ITERATION_DEPTH() == 1 #elif BOOST_PP_ITERATION_DEPTH() == 1
#define PHOENIX_ITERATION BOOST_PP_ITERATION() #define PHOENIX_ITERATION BOOST_PP_ITERATION()
@ -87,7 +87,7 @@ namespace boost { namespace phoenix {
#undef PHOENIX_ITERATION #undef PHOENIX_ITERATION
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
#define PHOENIX_ITERATION BOOST_PP_ITERATION() #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 #endif
#else if BOOST_PP_ITERATION_DEPTH() == 1 #elif BOOST_PP_ITERATION_DEPTH() == 1
#define PHOENIX_ITERATION BOOST_PP_ITERATION() #define PHOENIX_ITERATION BOOST_PP_ITERATION()
@ -65,7 +65,7 @@ namespace boost { namespace phoenix {
#undef PHOENIX_ITERATION #undef PHOENIX_ITERATION
#else if BOOST_PP_ITERATION_DEPTH() == 2 #elif BOOST_PP_ITERATION_DEPTH() == 2
#define PHOENIX_ITERATION BOOST_PP_ITERATION() #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 ///// iteration, depth == 1
#else if BOOST_PP_ITERATION_DEPTH() == 1 #elif BOOST_PP_ITERATION_DEPTH() == 1
#define i BOOST_PP_FRAME_ITERATION(1) #define i BOOST_PP_FRAME_ITERATION(1)
#if i > 0 #if i > 0