From 9b42f0453ee627f881a90affdd9735440b58f07a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 11 Oct 2013 23:13:10 +0000 Subject: [PATCH] Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION Process #ifdef...#endif blocks. [SVN r86243] --- include/boost/mpl/apply.hpp | 22 ----------- include/boost/mpl/aux_/fold_impl.hpp | 4 -- include/boost/mpl/aux_/iter_fold_impl.hpp | 4 -- include/boost/mpl/aux_/joint_iter.hpp | 3 -- include/boost/mpl/aux_/range_c/iterator.hpp | 4 -- include/boost/mpl/aux_/sequence_wrapper.hpp | 41 --------------------- include/boost/mpl/bind.hpp | 3 -- include/boost/mpl/list/aux_/iterator.hpp | 4 -- include/boost/mpl/pair_view.hpp | 36 ------------------ include/boost/mpl/set/aux_/iterator.hpp | 3 -- include/boost/mpl/vector/aux_/iterator.hpp | 10 ----- 11 files changed, 134 deletions(-) diff --git a/include/boost/mpl/apply.hpp b/include/boost/mpl/apply.hpp index 5f3dbd9..83509a3 100644 --- a/include/boost/mpl/apply.hpp +++ b/include/boost/mpl/apply.hpp @@ -94,28 +94,6 @@ namespace boost { namespace mpl { #include BOOST_PP_ITERATE() // real C++ version is already taken care of -# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - -namespace aux { -// apply_count_args -#define AUX778076_COUNT_ARGS_PREFIX apply -#define AUX778076_COUNT_ARGS_DEFAULT na -#define AUX778076_COUNT_ARGS_ARITY BOOST_MPL_LIMIT_METAFUNCTION_ARITY -#include -} - - -template< - typename F, AUX778076_APPLY_DEF_PARAMS(typename T, na) - > -struct apply - : aux::apply_chooser< - aux::apply_count_args< AUX778076_APPLY_PARAMS(T) >::value - >::template result_< F, AUX778076_APPLY_PARAMS(T) >::type -{ -}; - -# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION # undef AUX778076_APPLY_N_SPEC_PARAMS # undef AUX778076_APPLY_N_PARTIAL_SPEC_PARAMS diff --git a/include/boost/mpl/aux_/fold_impl.hpp b/include/boost/mpl/aux_/fold_impl.hpp index 97c88c5..f7dd10c 100644 --- a/include/boost/mpl/aux_/fold_impl.hpp +++ b/include/boost/mpl/aux_/fold_impl.hpp @@ -19,10 +19,6 @@ # include # include # include -# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) -# include -# include -# endif #endif #include diff --git a/include/boost/mpl/aux_/iter_fold_impl.hpp b/include/boost/mpl/aux_/iter_fold_impl.hpp index b4d2922..fc07439 100644 --- a/include/boost/mpl/aux_/iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/iter_fold_impl.hpp @@ -18,10 +18,6 @@ # include # include # include -# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) -# include -# include -# endif #endif #include diff --git a/include/boost/mpl/aux_/joint_iter.hpp b/include/boost/mpl/aux_/joint_iter.hpp index 277580e..da5d3fc 100644 --- a/include/boost/mpl/aux_/joint_iter.hpp +++ b/include/boost/mpl/aux_/joint_iter.hpp @@ -20,9 +20,6 @@ #include #include -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) -# include -#endif namespace boost { namespace mpl { diff --git a/include/boost/mpl/aux_/range_c/iterator.hpp b/include/boost/mpl/aux_/range_c/iterator.hpp index 4a020d0..f828f6f 100644 --- a/include/boost/mpl/aux_/range_c/iterator.hpp +++ b/include/boost/mpl/aux_/range_c/iterator.hpp @@ -33,10 +33,6 @@ template< typename N > struct r_iter typedef random_access_iterator_tag category; typedef N type; -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - typedef r_iter< typename mpl::next::type > next; - typedef r_iter< typename mpl::prior::type > prior; -#endif }; #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) diff --git a/include/boost/mpl/aux_/sequence_wrapper.hpp b/include/boost/mpl/aux_/sequence_wrapper.hpp index 740ab16..33e61e3 100644 --- a/include/boost/mpl/aux_/sequence_wrapper.hpp +++ b/include/boost/mpl/aux_/sequence_wrapper.hpp @@ -163,47 +163,6 @@ struct BOOST_PP_CAT(AUX778076_SEQUENCE_NAME,_chooser); #include BOOST_PP_ITERATE() // real C++ version is already taken care of -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - -namespace aux { -// ???_count_args -#define AUX778076_COUNT_ARGS_PREFIX AUX778076_SEQUENCE_NAME -#define AUX778076_COUNT_ARGS_DEFAULT AUX778076_SEQUENCE_DEFAULT -#define AUX778076_COUNT_ARGS_PARAM_NAME AUX778076_SEQUENCE_PARAM_NAME -#define AUX778076_COUNT_ARGS_TEMPLATE_PARAM AUX778076_SEQUENCE_TEMPLATE_PARAM -#define AUX778076_COUNT_ARGS_ARITY AUX778076_SEQUENCE_LIMIT -#define AUX778076_COUNT_ARGS_USE_STANDARD_PP_PRIMITIVES -#include - -template< - AUX778076_SEQUENCE_PARAMS() - > -struct BOOST_PP_CAT(AUX778076_SEQUENCE_NAME,_impl) -{ - typedef aux::BOOST_PP_CAT(AUX778076_SEQUENCE_NAME,_count_args)< - BOOST_PP_ENUM_PARAMS(AUX778076_SEQUENCE_LIMIT, AUX778076_SEQUENCE_PARAM_NAME) - > arg_num_; - - typedef typename aux::BOOST_PP_CAT(AUX778076_SEQUENCE_NAME,_chooser)< arg_num_::value > - ::template result_< AUX778076_SEQUENCE_ARGS() >::type type; -}; - -} // namespace aux - -template< - AUX778076_SEQUENCE_DEFAULT_PARAMS() - > -struct AUX778076_SEQUENCE_NAME - : aux::BOOST_PP_CAT(AUX778076_SEQUENCE_NAME,_impl)< - AUX778076_SEQUENCE_ARGS() - >::type -{ - typedef typename aux::BOOST_PP_CAT(AUX778076_SEQUENCE_NAME,_impl)< - AUX778076_SEQUENCE_ARGS() - >::type type; -}; - -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION # undef AUX778076_SEQUENCE_N_PARTIAL_SPEC_ARGS # undef AUX778076_SEQUENCE_N_ARGS diff --git a/include/boost/mpl/bind.hpp b/include/boost/mpl/bind.hpp index 56769ad..b2ece5c 100644 --- a/include/boost/mpl/bind.hpp +++ b/include/boost/mpl/bind.hpp @@ -30,9 +30,6 @@ # include # include # include -# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) -# include -# endif #endif #include diff --git a/include/boost/mpl/list/aux_/iterator.hpp b/include/boost/mpl/list/aux_/iterator.hpp index 6b5ea78..170a320 100644 --- a/include/boost/mpl/list/aux_/iterator.hpp +++ b/include/boost/mpl/list/aux_/iterator.hpp @@ -63,10 +63,6 @@ template<> struct l_iter { typedef aux::l_iter_tag tag; typedef forward_iterator_tag category; -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - typedef na type; - typedef l_iter next; -#endif }; BOOST_MPL_AUX_PASS_THROUGH_LAMBDA_SPEC(1, l_iter) diff --git a/include/boost/mpl/pair_view.hpp b/include/boost/mpl/pair_view.hpp index a72cf92..9a49a78 100644 --- a/include/boost/mpl/pair_view.hpp +++ b/include/boost/mpl/pair_view.hpp @@ -32,30 +32,6 @@ namespace boost { namespace mpl { namespace aux { struct pair_iter_tag; -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - -template< typename Iter1, typename Iter2, typename Category > -struct pair_iter; - -template< typename Category > struct prior_pair_iter -{ - template< typename Iter1, typename Iter2 > struct apply - { - typedef typename mpl::prior::type i1_; - typedef typename mpl::prior::type i2_; - typedef pair_iter type; - }; -}; - -template<> struct prior_pair_iter -{ - template< typename Iter1, typename Iter2 > struct apply - { - typedef pair_iter type; - }; -}; - -#endif } template< @@ -70,18 +46,6 @@ struct pair_iter typedef Iter1 first; typedef Iter2 second; -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - typedef pair< - typename deref::type - , typename deref::type - > type; - - typedef typename mpl::next::type i1_; - typedef typename mpl::next::type i2_; - typedef pair_iter next; - - typedef apply_wrap2< aux::prior_pair_iter,Iter1,Iter2 >::type prior; -#endif }; diff --git a/include/boost/mpl/set/aux_/iterator.hpp b/include/boost/mpl/set/aux_/iterator.hpp index 9a58a25..79cbf70 100644 --- a/include/boost/mpl/set/aux_/iterator.hpp +++ b/include/boost/mpl/set/aux_/iterator.hpp @@ -44,9 +44,6 @@ template< typename Set, typename Tail > struct s_iter_impl typedef forward_iterator_tag category; typedef typename Tail::item_type_ type; -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - typedef typename s_iter_get< Set,typename Tail::base >::type next; -#endif }; #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) diff --git a/include/boost/mpl/vector/aux_/iterator.hpp b/include/boost/mpl/vector/aux_/iterator.hpp index cc67ecd..94712ca 100644 --- a/include/boost/mpl/vector/aux_/iterator.hpp +++ b/include/boost/mpl/vector/aux_/iterator.hpp @@ -41,16 +41,6 @@ struct v_iter typedef Vector vector_; typedef mpl::long_ pos; -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - enum { - next_ = n_ + 1 - , prior_ = n_ - 1 - , pos_ = n_ - }; - - typedef v_iter next; - typedef v_iter prior; -#endif };