1.1 --- a/epoc32/include/stdapis/boost/preprocessor/array/remove.hpp	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/boost/preprocessor/array/remove.hpp	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -9,21 +9,46 @@
     1.4  #
     1.5  # /* See http://www.boost.org for most recent version. */
     1.6  #
     1.7 -# ifndef BOOST_PREPROCESSOR_SEQ_REMOVE_HPP
     1.8 -# define BOOST_PREPROCESSOR_SEQ_REMOVE_HPP
     1.9 +# ifndef BOOST_PREPROCESSOR_ARRAY_REMOVE_HPP
    1.10 +# define BOOST_PREPROCESSOR_ARRAY_REMOVE_HPP
    1.11  #
    1.12  # include <boost/preprocessor/arithmetic/inc.hpp>
    1.13 -# include <boost/preprocessor/config/config.hpp>
    1.14 -# include <boost/preprocessor/seq/first_n.hpp>
    1.15 -# include <boost/preprocessor/seq/rest_n.hpp>
    1.16 +# include <boost/preprocessor/array/elem.hpp>
    1.17 +# include <boost/preprocessor/array/push_back.hpp>
    1.18 +# include <boost/preprocessor/array/size.hpp>
    1.19 +# include <boost/preprocessor/comparison/not_equal.hpp>
    1.20 +# include <boost/preprocessor/control/deduce_d.hpp>
    1.21 +# include <boost/preprocessor/control/iif.hpp>
    1.22 +# include <boost/preprocessor/control/while.hpp>
    1.23 +# include <boost/preprocessor/tuple/eat.hpp>
    1.24 +# include <boost/preprocessor/tuple/elem.hpp>
    1.25  #
    1.26 -# /* BOOST_PP_SEQ_REMOVE */
    1.27 +# /* BOOST_PP_ARRAY_REMOVE */
    1.28 +#
    1.29 +# define BOOST_PP_ARRAY_REMOVE(array, i) BOOST_PP_ARRAY_REMOVE_I(BOOST_PP_DEDUCE_D(), array, i)
    1.30 +# define BOOST_PP_ARRAY_REMOVE_I(d, array, i) BOOST_PP_ARRAY_REMOVE_D(d, array, i)
    1.31 +#
    1.32 +# /* BOOST_PP_ARRAY_REMOVE_D */
    1.33  #
    1.34  # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
    1.35 -#    define BOOST_PP_SEQ_REMOVE(seq, i) BOOST_PP_SEQ_FIRST_N(i, seq) BOOST_PP_SEQ_REST_N(BOOST_PP_INC(i), seq)
    1.36 +#    define BOOST_PP_ARRAY_REMOVE_D(d, array, i) BOOST_PP_TUPLE_ELEM(4, 2, BOOST_PP_WHILE_ ## d(BOOST_PP_ARRAY_REMOVE_P, BOOST_PP_ARRAY_REMOVE_O, (0, i, (0, ()), array)))
    1.37  # else
    1.38 -#    define BOOST_PP_SEQ_REMOVE(seq, i) BOOST_PP_SEQ_REMOVE_I(seq, i)
    1.39 -#    define BOOST_PP_SEQ_REMOVE_I(seq, i) BOOST_PP_SEQ_FIRST_N(i, seq) BOOST_PP_SEQ_REST_N(BOOST_PP_INC(i), seq)
    1.40 +#    define BOOST_PP_ARRAY_REMOVE_D(d, array, i) BOOST_PP_ARRAY_REMOVE_D_I(d, array, i)
    1.41 +#    define BOOST_PP_ARRAY_REMOVE_D_I(d, array, i) BOOST_PP_TUPLE_ELEM(4, 2, BOOST_PP_WHILE_ ## d(BOOST_PP_ARRAY_REMOVE_P, BOOST_PP_ARRAY_REMOVE_O, (0, i, (0, ()), array)))
    1.42 +# endif
    1.43 +#
    1.44 +# define BOOST_PP_ARRAY_REMOVE_P(d, st) BOOST_PP_NOT_EQUAL(BOOST_PP_TUPLE_ELEM(4, 0, st), BOOST_PP_ARRAY_SIZE(BOOST_PP_TUPLE_ELEM(4, 3, st)))
    1.45 +#
    1.46 +# if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()
    1.47 +#    define BOOST_PP_ARRAY_REMOVE_O(d, st) BOOST_PP_ARRAY_REMOVE_O_I st
    1.48 +# else
    1.49 +#    define BOOST_PP_ARRAY_REMOVE_O(d, st) BOOST_PP_ARRAY_REMOVE_O_I(BOOST_PP_TUPLE_ELEM(4, 0, st), BOOST_PP_TUPLE_ELEM(4, 1, st), BOOST_PP_TUPLE_ELEM(4, 2, st), BOOST_PP_TUPLE_ELEM(4, 3, st))
    1.50 +# endif
    1.51 +#
    1.52 +# if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
    1.53 +#    define BOOST_PP_ARRAY_REMOVE_O_I(n, i, res, arr) (BOOST_PP_INC(n), i, BOOST_PP_IIF(BOOST_PP_NOT_EQUAL(n, i), BOOST_PP_ARRAY_PUSH_BACK, res BOOST_PP_TUPLE_EAT_2)(res, BOOST_PP_ARRAY_ELEM(n, arr)), arr)
    1.54 +# else
    1.55 +#    define BOOST_PP_ARRAY_REMOVE_O_I(n, i, res, arr) (BOOST_PP_INC(n), i, BOOST_PP_IIF(BOOST_PP_NOT_EQUAL(n, i), BOOST_PP_ARRAY_PUSH_BACK, BOOST_PP_TUPLE_ELEM_2_0)(res, BOOST_PP_ARRAY_ELEM(n, arr)), arr)
    1.56  # endif
    1.57  #
    1.58  # endif