From 553aa2e52fcd0065f2cbfc98988e77ada7d092fa Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 11 Oct 2013 23:22:36 +0000 Subject: [PATCH] Remove remaining occurances of BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION These evaded scripting. [SVN r86249] --- include/boost/mpl/aux_/config/ctps.hpp | 2 - include/boost/mpl/aux_/numeric_op.hpp | 10 ----- include/boost/mpl/aux_/reverse_fold_impl.hpp | 3 +- .../boost/mpl/aux_/reverse_fold_impl_body.hpp | 12 +++--- .../boost/mpl/aux_/reverse_iter_fold_impl.hpp | 3 +- include/boost/mpl/bind.hpp | 39 +------------------ include/boost/mpl/integral_c.hpp | 3 +- include/boost/mpl/vector/aux_/at.hpp | 5 +-- .../mpl/vector/aux_/include_preprocessed.hpp | 3 +- include/boost/mpl/vector/aux_/numbered.hpp | 5 +-- 10 files changed, 14 insertions(+), 71 deletions(-) diff --git a/include/boost/mpl/aux_/config/ctps.hpp b/include/boost/mpl/aux_/config/ctps.hpp index af78f47..fc1797f 100644 --- a/include/boost/mpl/aux_/config/ctps.hpp +++ b/include/boost/mpl/aux_/config/ctps.hpp @@ -25,6 +25,4 @@ #endif -// BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION is defined in - #endif // BOOST_MPL_AUX_CONFIG_CTPS_HPP_INCLUDED diff --git a/include/boost/mpl/aux_/numeric_op.hpp b/include/boost/mpl/aux_/numeric_op.hpp index 2694a0c..d01ff37 100644 --- a/include/boost/mpl/aux_/numeric_op.hpp +++ b/include/boost/mpl/aux_/numeric_op.hpp @@ -110,20 +110,10 @@ template< typename Tag > struct AUX778076_OP_IMPL_NAME }; }; - -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && defined(BOOST_MSVC) -template< typename T > struct AUX778076_OP_TAG_NAME - : tag -{ -}; -#else template< typename T > struct AUX778076_OP_TAG_NAME { typedef typename T::tag type; }; -#endif - #if AUX778076_OP_ARITY != 2 diff --git a/include/boost/mpl/aux_/reverse_fold_impl.hpp b/include/boost/mpl/aux_/reverse_fold_impl.hpp index a27a35f..1a68f7e 100644 --- a/include/boost/mpl/aux_/reverse_fold_impl.hpp +++ b/include/boost/mpl/aux_/reverse_fold_impl.hpp @@ -19,8 +19,7 @@ # include # include # include -# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - || defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) +# if defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) # include # include # endif diff --git a/include/boost/mpl/aux_/reverse_fold_impl_body.hpp b/include/boost/mpl/aux_/reverse_fold_impl_body.hpp index 5c99c69..1f034d1 100644 --- a/include/boost/mpl/aux_/reverse_fold_impl_body.hpp +++ b/include/boost/mpl/aux_/reverse_fold_impl_body.hpp @@ -76,8 +76,7 @@ template< > struct AUX778076_FOLD_IMPL_NAME; -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) +#if !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) # define BOOST_PP_ITERATION_PARAMS_1 \ (3,(0, BOOST_MPL_LIMIT_UNROLLING, )) @@ -164,7 +163,7 @@ struct AUX778076_FOLD_IMPL_NAME<-1,Last,Last,State,BackwardOp,ForwardOp> typedef Last iterator; }; -#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#else // BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC template< long N > struct AUX778076_FOLD_CHUNK_NAME; @@ -301,7 +300,7 @@ struct AUX778076_FOLD_IMPL_NAME { }; -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#endif // BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC }}} @@ -319,8 +318,7 @@ struct AUX778076_FOLD_IMPL_NAME # define n_ BOOST_PP_FRAME_ITERATION(1) -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) +#if !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) template< typename First @@ -388,7 +386,7 @@ template<> struct AUX778076_FOLD_CHUNK_NAME }; -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#endif // BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC # undef n_ diff --git a/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp b/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp index 83182a2..ae8551d 100644 --- a/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp +++ b/include/boost/mpl/aux_/reverse_iter_fold_impl.hpp @@ -18,8 +18,7 @@ # include # include # include -# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - || defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) +# if defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) # include # include # endif diff --git a/include/boost/mpl/bind.hpp b/include/boost/mpl/bind.hpp index 74e3207..82a0c06 100644 --- a/include/boost/mpl/bind.hpp +++ b/include/boost/mpl/bind.hpp @@ -174,8 +174,7 @@ struct resolve_bind_arg< bind,AUX778076_BIND_PARAMS( (3,(0, BOOST_MPL_LIMIT_METAFUNCTION_ARITY, )) #include BOOST_PP_ITERATE() -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !defined(BOOST_MPL_CFG_NO_TEMPLATE_TEMPLATE_PARAMETERS) +#if !defined(BOOST_MPL_CFG_NO_TEMPLATE_TEMPLATE_PARAMETERS) /// if_/eval_if specializations # define AUX778076_SPEC_NAME if_ # define BOOST_PP_ITERATION_PARAMS_1 (3,(3, 3, )) @@ -188,42 +187,6 @@ struct resolve_bind_arg< bind,AUX778076_BIND_PARAMS( #endif #endif -// real C++ version is already taken care of -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !defined(BOOST_MPL_CFG_NO_BIND_TEMPLATE) - -namespace aux { -// apply_count_args -#define AUX778076_COUNT_ARGS_PREFIX bind -#define AUX778076_COUNT_ARGS_DEFAULT na -#define AUX778076_COUNT_ARGS_ARITY BOOST_MPL_LIMIT_METAFUNCTION_ARITY -#include -} - -// bind -template< - typename F, AUX778076_BIND_PARAMS(typename T) AUX778076_DMC_PARAM() - > -struct bind - : aux::bind_chooser< - aux::bind_count_args::value - >::template result_< F,AUX778076_BIND_PARAMS(T) >::type -{ -}; - -BOOST_MPL_AUX_ARITY_SPEC( - BOOST_PP_INC(BOOST_MPL_LIMIT_METAFUNCTION_ARITY) - , bind - ) - -BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC( - BOOST_PP_INC(BOOST_MPL_LIMIT_METAFUNCTION_ARITY) - , bind - ) - - -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - # undef AUX778076_BIND_NESTED_DEFAULT_PARAMS # undef AUX778076_BIND_N_SPEC_PARAMS # undef AUX778076_BIND_N_PARAMS diff --git a/include/boost/mpl/integral_c.hpp b/include/boost/mpl/integral_c.hpp index 7a692dc..416e9c6 100644 --- a/include/boost/mpl/integral_c.hpp +++ b/include/boost/mpl/integral_c.hpp @@ -32,8 +32,7 @@ #include -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !BOOST_WORKAROUND(__BORLANDC__, <= 0x551) +#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x551) BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN // 'bool' constant doesn't have 'next'/'prior' members template< bool C > diff --git a/include/boost/mpl/vector/aux_/at.hpp b/include/boost/mpl/vector/aux_/at.hpp index b1802cc..65d10ca 100644 --- a/include/boost/mpl/vector/aux_/at.hpp +++ b/include/boost/mpl/vector/aux_/at.hpp @@ -55,8 +55,7 @@ struct at_impl< aux::vector_tag > #else -# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) +# if !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) template< typename Vector, long n_ > struct v_at; @@ -106,7 +105,7 @@ struct v_at { }; -# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +# endif // BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC #endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES diff --git a/include/boost/mpl/vector/aux_/include_preprocessed.hpp b/include/boost/mpl/vector/aux_/include_preprocessed.hpp index a676116..c8766f1 100644 --- a/include/boost/mpl/vector/aux_/include_preprocessed.hpp +++ b/include/boost/mpl/vector/aux_/include_preprocessed.hpp @@ -23,8 +23,7 @@ #if defined(BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES) # define AUX778076_INCLUDE_DIR typeof_based -#elif defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - || defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) +#elif defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) # define AUX778076_INCLUDE_DIR no_ctps #else # define AUX778076_INCLUDE_DIR plain diff --git a/include/boost/mpl/vector/aux_/numbered.hpp b/include/boost/mpl/vector/aux_/numbered.hpp index b3f0387..4ca9954 100644 --- a/include/boost/mpl/vector/aux_/numbered.hpp +++ b/include/boost/mpl/vector/aux_/numbered.hpp @@ -125,8 +125,7 @@ struct pop_back_impl< aux::vector_tag > # endif // i_ > 0 -# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) +# if !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) template< typename V > struct v_at @@ -209,7 +208,7 @@ struct clear_impl< aux::vector_tag > }; }; -# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +# endif // BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC #endif // BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES