From 1a9f6351c4f4c36b9cb8cb62f1f6cbcd9ef418aa Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Sat, 28 Sep 2002 09:31:58 +0000 Subject: [PATCH] ## fixes [SVN r15537] --- include/boost/mpl/list.hpp | 12 ++++-------- include/boost/mpl/list_c.hpp | 12 ++++-------- include/boost/mpl/vector.hpp | 12 ++++-------- include/boost/mpl/vector_c.hpp | 12 ++++-------- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/include/boost/mpl/list.hpp b/include/boost/mpl/list.hpp index b68a0a9..697ca0f 100644 --- a/include/boost/mpl/list.hpp +++ b/include/boost/mpl/list.hpp @@ -30,14 +30,10 @@ # include "boost/preprocessor/stringize.hpp" # define MPL_AUX_LIST_HEADER \ - BOOST_PP_STRINGIZE( \ - BOOST_PP_CAT( \ - BOOST_PP_CAT(boost/mpl/list/list, BOOST_MPL_LIMIT_LIST_SIZE) \ - ,.##hpp) \ - ) \ + BOOST_PP_CAT(list,BOOST_MPL_LIMIT_LIST_SIZE).hpp \ /**/ -# include MPL_AUX_LIST_HEADER +# include BOOST_PP_STRINGIZE(boost/mpl/list/MPL_AUX_LIST_HEADER) # undef MPL_AUX_LIST_HEADER #endif @@ -52,9 +48,9 @@ #else # include "boost/mpl/limits/list.hpp" -# include "boost/mpl/aux_/preprocessor/project1st.hpp" # include "boost/preprocessor/arithmetic/sub.hpp" +# include "boost/preprocessor/tuple/elem.hpp" # include "boost/preprocessor/enum_params_with_a_default.hpp" # include "boost/preprocessor/enum_params.hpp" # include "boost/preprocessor/enum.hpp" @@ -91,7 +87,7 @@ namespace mpl { BOOST_PP_COMMA_IF(n) \ BOOST_PP_ENUM( \ BOOST_PP_SUB_D(1,BOOST_MPL_LIMIT_LIST_SIZE,n) \ - , BOOST_MPL_PP_PROJECT2ND \ + , BOOST_PP_TUPLE_ELEM_3_2 \ , def \ ) \ /**/ diff --git a/include/boost/mpl/list_c.hpp b/include/boost/mpl/list_c.hpp index 2d494c7..2a8739d 100644 --- a/include/boost/mpl/list_c.hpp +++ b/include/boost/mpl/list_c.hpp @@ -29,14 +29,10 @@ # include "boost/preprocessor/stringize.hpp" # define MPL_AUX_LIST_HEADER \ - BOOST_PP_STRINGIZE( \ - BOOST_PP_CAT( \ - BOOST_PP_CAT(boost/mpl/list/list, BOOST_MPL_LIMIT_LIST_SIZE) \ - ,_c.##hpp) \ - ) \ + BOOST_PP_CAT(BOOST_PP_CAT(list,BOOST_MPL_LIMIT_LIST_SIZE), _c).hpp \ /**/ -# include MPL_AUX_LIST_HEADER +# include BOOST_PP_STRINGIZE(boost/mpl/list/MPL_AUX_LIST_HEADER) # undef MPL_AUX_LIST_HEADER # include #endif @@ -52,9 +48,9 @@ #else # include "boost/mpl/limits/list.hpp" -# include "boost/mpl/aux_/preprocessor/project1st.hpp" # include "boost/preprocessor/arithmetic/sub.hpp" +# include "boost/preprocessor/tuple/elem.hpp" # include "boost/preprocessor/enum_params_with_a_default.hpp" # include "boost/preprocessor/enum_params.hpp" # include "boost/preprocessor/enum.hpp" @@ -100,7 +96,7 @@ namespace mpl { BOOST_PP_COMMA_IF(n) \ BOOST_PP_ENUM( \ BOOST_PP_SUB_D(1,BOOST_MPL_LIMIT_LIST_SIZE,n) \ - , BOOST_MPL_PP_PROJECT2ND \ + , BOOST_PP_TUPLE_ELEM_3_2 \ , def \ ) \ /**/ diff --git a/include/boost/mpl/vector.hpp b/include/boost/mpl/vector.hpp index 4685e94..c10dbd6 100644 --- a/include/boost/mpl/vector.hpp +++ b/include/boost/mpl/vector.hpp @@ -30,14 +30,10 @@ # include "boost/preprocessor/stringize.hpp" # define MPL_AUX_VECTOR_HEADER \ - BOOST_PP_STRINGIZE( \ - BOOST_PP_CAT( \ - BOOST_PP_CAT(boost/mpl/vector/vector, BOOST_MPL_LIMIT_VECTOR_SIZE) \ - ,.##hpp) \ - ) \ + BOOST_PP_CAT(vector, BOOST_MPL_LIMIT_VECTOR_SIZE).hpp \ /**/ -# include MPL_AUX_VECTOR_HEADER +# include BOOST_PP_STRINGIZE(boost/mpl/vector/MPL_AUX_VECTOR_HEADER) # undef MPL_AUX_VECTOR_HEADER #endif @@ -52,9 +48,9 @@ #else # include "boost/mpl/limits/vector.hpp" -# include "boost/mpl/aux_/preprocessor/project1st.hpp" # include "boost/preprocessor/arithmetic/sub.hpp" +# include "boost/preprocessor/tuple/elem.hpp" # include "boost/preprocessor/enum_params_with_a_default.hpp" # include "boost/preprocessor/enum_params.hpp" # include "boost/preprocessor/enum.hpp" @@ -91,7 +87,7 @@ namespace mpl { BOOST_PP_COMMA_IF(n) \ BOOST_PP_ENUM( \ BOOST_PP_SUB_D(1,BOOST_MPL_LIMIT_VECTOR_SIZE,n) \ - , BOOST_MPL_PP_PROJECT2ND \ + , BOOST_PP_TUPLE_ELEM_3_2 \ , def \ ) \ /**/ diff --git a/include/boost/mpl/vector_c.hpp b/include/boost/mpl/vector_c.hpp index c820d23..fd282a1 100644 --- a/include/boost/mpl/vector_c.hpp +++ b/include/boost/mpl/vector_c.hpp @@ -29,14 +29,10 @@ # include "boost/preprocessor/stringize.hpp" # define MPL_AUX_VECTOR_HEADER \ - BOOST_PP_STRINGIZE( \ - BOOST_PP_CAT( \ - BOOST_PP_CAT(boost/mpl/vector/vector, BOOST_MPL_LIMIT_VECTOR_SIZE) \ - ,_c.##hpp) \ - ) \ + BOOST_PP_CAT(BOOST_PP_CAT(vector,BOOST_MPL_LIMIT_VECTOR_SIZE), _c).hpp \ /**/ -# include MPL_AUX_VECTOR_HEADER +# include BOOST_PP_STRINGIZE(boost/mpl/vector/MPL_AUX_VECTOR_HEADER) # undef MPL_AUX_VECTOR_HEADER # include #endif @@ -52,9 +48,9 @@ #else # include "boost/mpl/limits/vector.hpp" -# include "boost/mpl/aux_/preprocessor/project1st.hpp" # include "boost/preprocessor/arithmetic/sub.hpp" +# include "boost/preprocessor/tuple/elem.hpp" # include "boost/preprocessor/enum_params_with_a_default.hpp" # include "boost/preprocessor/enum_params.hpp" # include "boost/preprocessor/enum.hpp" @@ -100,7 +96,7 @@ namespace mpl { BOOST_PP_COMMA_IF(n) \ BOOST_PP_ENUM( \ BOOST_PP_SUB_D(1,BOOST_MPL_LIMIT_VECTOR_SIZE,n) \ - , BOOST_MPL_PP_PROJECT2ND \ + , BOOST_PP_TUPLE_ELEM_3_2 \ , def \ ) \ /**/