1.1 --- a/epoc32/include/stdapis/boost/preprocessor/array/insert.hpp	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/boost/preprocessor/array/insert.hpp	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -9,20 +9,47 @@
     1.4  #
     1.5  # /* See http://www.boost.org for most recent version. */
     1.6  #
     1.7 -# ifndef BOOST_PREPROCESSOR_SEQ_INSERT_HPP
     1.8 -# define BOOST_PREPROCESSOR_SEQ_INSERT_HPP
     1.9 +# ifndef BOOST_PREPROCESSOR_ARRAY_INSERT_HPP
    1.10 +# define BOOST_PREPROCESSOR_ARRAY_INSERT_HPP
    1.11  #
    1.12 -# include <boost/preprocessor/config/config.hpp>
    1.13 -# include <boost/preprocessor/seq/first_n.hpp>
    1.14 -# include <boost/preprocessor/seq/rest_n.hpp>
    1.15 +# include <boost/preprocessor/arithmetic/inc.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/elem.hpp>
    1.24  #
    1.25 -# /* BOOST_PP_SEQ_INSERT */
    1.26 +# /* BOOST_PP_ARRAY_INSERT */
    1.27 +#
    1.28 +# define BOOST_PP_ARRAY_INSERT(array, i, elem) BOOST_PP_ARRAY_INSERT_I(BOOST_PP_DEDUCE_D(), array, i, elem)
    1.29 +# define BOOST_PP_ARRAY_INSERT_I(d, array, i, elem) BOOST_PP_ARRAY_INSERT_D(d, array, i, elem)
    1.30 +#
    1.31 +# /* BOOST_PP_ARRAY_INSERT_D */
    1.32  #
    1.33  # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
    1.34 -#    define BOOST_PP_SEQ_INSERT(seq, i, elem) BOOST_PP_SEQ_FIRST_N(i, seq) (elem) BOOST_PP_SEQ_REST_N(i, seq)
    1.35 +#    define BOOST_PP_ARRAY_INSERT_D(d, array, i, elem) BOOST_PP_TUPLE_ELEM(5, 3, BOOST_PP_WHILE_ ## d(BOOST_PP_ARRAY_INSERT_P, BOOST_PP_ARRAY_INSERT_O, (0, i, elem, (0, ()), array)))
    1.36  # else
    1.37 -#    define BOOST_PP_SEQ_INSERT(seq, i, elem) BOOST_PP_SEQ_INSERT_I(seq, i, elem)
    1.38 -#    define BOOST_PP_SEQ_INSERT_I(seq, i, elem) BOOST_PP_SEQ_FIRST_N(i, seq) (elem) BOOST_PP_SEQ_REST_N(i, seq)
    1.39 +#    define BOOST_PP_ARRAY_INSERT_D(d, array, i, elem) BOOST_PP_ARRAY_INSERT_D_I(d, array, i, elem)
    1.40 +#    define BOOST_PP_ARRAY_INSERT_D_I(d, array, i, elem) BOOST_PP_TUPLE_ELEM(5, 3, BOOST_PP_WHILE_ ## d(BOOST_PP_ARRAY_INSERT_P, BOOST_PP_ARRAY_INSERT_O, (0, i, elem, (0, ()), array)))
    1.41  # endif
    1.42  #
    1.43 +# if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()
    1.44 +#    define BOOST_PP_ARRAY_INSERT_P(d, state) BOOST_PP_ARRAY_INSERT_P_I state
    1.45 +# else
    1.46 +#    define BOOST_PP_ARRAY_INSERT_P(d, state) BOOST_PP_ARRAY_INSERT_P_I(nil, nil, nil, BOOST_PP_TUPLE_ELEM(5, 3, state), BOOST_PP_TUPLE_ELEM(5, 4, state))
    1.47  # endif
    1.48 +#
    1.49 +# define BOOST_PP_ARRAY_INSERT_P_I(_i, _ii, _iii, res, arr) BOOST_PP_NOT_EQUAL(BOOST_PP_ARRAY_SIZE(res), BOOST_PP_INC(BOOST_PP_ARRAY_SIZE(arr)))
    1.50 +#
    1.51 +# if BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_STRICT()
    1.52 +#    define BOOST_PP_ARRAY_INSERT_O(d, state) BOOST_PP_ARRAY_INSERT_O_I state
    1.53 +# else
    1.54 +#    define BOOST_PP_ARRAY_INSERT_O(d, state) BOOST_PP_ARRAY_INSERT_O_I(BOOST_PP_TUPLE_ELEM(5, 0, state), BOOST_PP_TUPLE_ELEM(5, 1, state), BOOST_PP_TUPLE_ELEM(5, 2, state), BOOST_PP_TUPLE_ELEM(5, 3, state), BOOST_PP_TUPLE_ELEM(5, 4, state))
    1.55 +# endif
    1.56 +#
    1.57 +# define BOOST_PP_ARRAY_INSERT_O_I(n, i, elem, res, arr) (BOOST_PP_IIF(BOOST_PP_NOT_EQUAL(BOOST_PP_ARRAY_SIZE(res), i), BOOST_PP_INC(n), n), i, elem, BOOST_PP_ARRAY_PUSH_BACK(res, BOOST_PP_IIF(BOOST_PP_NOT_EQUAL(BOOST_PP_ARRAY_SIZE(res), i), BOOST_PP_ARRAY_ELEM(n, arr), elem)), arr)
    1.58 +#
    1.59 +# endif