diff options
Diffstat (limited to 'boost/preprocessor/seq/rest_n.hpp')
| -rw-r--r-- | boost/preprocessor/seq/rest_n.hpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/boost/preprocessor/seq/rest_n.hpp b/boost/preprocessor/seq/rest_n.hpp index 64233760de..4aefba4fa1 100644 --- a/boost/preprocessor/seq/rest_n.hpp +++ b/boost/preprocessor/seq/rest_n.hpp @@ -13,18 +13,34 @@ # define BOOST_PREPROCESSOR_SEQ_REST_N_HPP # # include <boost/preprocessor/arithmetic/inc.hpp> +# include <boost/preprocessor/comparison/not_equal.hpp> # include <boost/preprocessor/config/config.hpp> +# include <boost/preprocessor/control/expr_iif.hpp> # include <boost/preprocessor/facilities/identity.hpp> +# include <boost/preprocessor/logical/bitand.hpp> +# include <boost/preprocessor/seq/detail/is_empty.hpp> # include <boost/preprocessor/seq/detail/split.hpp> # include <boost/preprocessor/tuple/elem.hpp> # # /* BOOST_PP_SEQ_REST_N */ # # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG() -# define BOOST_PP_SEQ_REST_N(n, seq) BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_SEQ_SPLIT(BOOST_PP_INC(n), BOOST_PP_IDENTITY( (nil) seq )))() +# define BOOST_PP_SEQ_REST_N(n, seq) BOOST_PP_SEQ_REST_N_DETAIL_EXEC(n, seq, BOOST_PP_SEQ_DETAIL_EMPTY_SIZE(seq)) # else # define BOOST_PP_SEQ_REST_N(n, seq) BOOST_PP_SEQ_REST_N_I(n, seq) -# define BOOST_PP_SEQ_REST_N_I(n, seq) BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_SEQ_SPLIT(BOOST_PP_INC(n), BOOST_PP_IDENTITY( (nil) seq )))() +# define BOOST_PP_SEQ_REST_N_I(n, seq) BOOST_PP_SEQ_REST_N_DETAIL_EXEC(n, seq, BOOST_PP_SEQ_DETAIL_EMPTY_SIZE(seq)) # endif # +# define BOOST_PP_SEQ_REST_N_DETAIL_EXEC(n, seq, size) \ + BOOST_PP_EXPR_IIF \ + ( \ + BOOST_PP_BITAND \ + ( \ + BOOST_PP_SEQ_DETAIL_IS_NOT_EMPTY_SIZE(size), \ + BOOST_PP_NOT_EQUAL(n,size) \ + ), \ + BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_SEQ_SPLIT(BOOST_PP_INC(n), BOOST_PP_IDENTITY( (nil) seq )))() \ + ) \ +/**/ +# # endif |