MPL: Remove use of obsolete macro.

[SVN r85958]
2025-08-01 05:44:37 +02:00 · 2013-09-26 13:07:02 +00:00
parent 18d0db5b5c
commit 8143a00562
30 changed files with 71 additions and 71 deletions
--- a/include/boost/mpl/advance.hpp
+++ b/include/boost/mpl/advance.hpp
@@ -61,7 +61,7 @@ struct advance

 template<
      typename Iterator
-    , BOOST_MPL_AUX_NTTP_DECL(long, N)
+    , long N
    >
 struct advance_c
    : advance_impl< typename tag<Iterator>::type >
--- a/include/boost/mpl/arg_fwd.hpp
+++ b/include/boost/mpl/arg_fwd.hpp
@@ -20,7 +20,7 @@

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN

-template< BOOST_MPL_AUX_NTTP_DECL(int, N) > struct arg;
+template< int N > struct arg;

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
 BOOST_MPL_AUX_ADL_BARRIER_DECL(arg)
--- a/include/boost/mpl/assert.hpp
+++ b/include/boost/mpl/assert.hpp
@@ -116,7 +116,7 @@ bool operator<=( failed, failed );
 template< bool (*)(failed, failed), long x, long y > struct assert_relation {};
 #   define BOOST_MPL_AUX_ASSERT_RELATION(x, y, r) assert_relation<r,x,y>
 #else
-template< BOOST_MPL_AUX_NTTP_DECL(long, x), BOOST_MPL_AUX_NTTP_DECL(long, y), bool (*)(failed, failed) > 
+template< long x, long y, bool (*)(failed, failed) > 
 struct assert_relation {};
 #   define BOOST_MPL_AUX_ASSERT_RELATION(x, y, r) assert_relation<x,y,r>
 #endif
--- a/include/boost/mpl/at.hpp
+++ b/include/boost/mpl/at.hpp
@@ -37,7 +37,7 @@ struct at

 template<
      typename Sequence
-    , BOOST_MPL_AUX_NTTP_DECL(long, N)
+    , long N
    >
 struct at_c
    : at_impl< typename sequence_tag<Sequence>::type >
--- a/include/boost/mpl/aux_/advance_backward.hpp
+++ b/include/boost/mpl/aux_/advance_backward.hpp
@@ -43,14 +43,14 @@
 namespace boost { namespace mpl { namespace aux {

 // forward declaration
-template< BOOST_MPL_AUX_NTTP_DECL(long, N) > struct advance_backward;
+template< long N > struct advance_backward;

 #   define BOOST_PP_ITERATION_PARAMS_1 \
    (3,(0, BOOST_MPL_LIMIT_UNROLLING, <boost/mpl/aux_/advance_backward.hpp>))
 #   include BOOST_PP_ITERATE()

 // implementation for N that exceeds BOOST_MPL_LIMIT_UNROLLING
-template< BOOST_MPL_AUX_NTTP_DECL(long, N) >
+template< long N >
 struct advance_backward
 {
    template< typename Iterator > struct apply
--- a/include/boost/mpl/aux_/advance_forward.hpp
+++ b/include/boost/mpl/aux_/advance_forward.hpp
@@ -43,14 +43,14 @@
 namespace boost { namespace mpl { namespace aux {

 // forward declaration
-template< BOOST_MPL_AUX_NTTP_DECL(long, N) > struct advance_forward;
+template< long N > struct advance_forward;

 #   define BOOST_PP_ITERATION_PARAMS_1 \
    (3,(0, BOOST_MPL_LIMIT_UNROLLING, <boost/mpl/aux_/advance_forward.hpp>))
 #   include BOOST_PP_ITERATE()

 // implementation for N that exceeds BOOST_MPL_LIMIT_UNROLLING
-template< BOOST_MPL_AUX_NTTP_DECL(long, N) > 
+template< long N > 
 struct advance_forward
 {
    template< typename Iterator > struct apply
--- a/include/boost/mpl/aux_/arity.hpp
+++ b/include/boost/mpl/aux_/arity.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace mpl { namespace aux {
 // agurt, 15/mar/02: it's possible to implement the template so that it will 
 // "just work" and do not require any specialization, but not on the compilers
 // that require the arity workaround in the first place
-template< typename F, BOOST_MPL_AUX_NTTP_DECL(int, N) >
+template< typename F, int N >
 struct arity
 {
    BOOST_STATIC_CONSTANT(int, value = N);
--- a/include/boost/mpl/aux_/arity_spec.hpp
+++ b/include/boost/mpl/aux_/arity_spec.hpp
@@ -27,7 +27,7 @@
 #if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 #   define BOOST_MPL_AUX_NONTYPE_ARITY_SPEC(i,type,name) \
 namespace aux { \
-template< BOOST_MPL_AUX_NTTP_DECL(int, N), BOOST_MPL_PP_PARAMS(i,type T) > \
+template< int N, BOOST_MPL_PP_PARAMS(i,type T) > \
 struct arity< \
      name< BOOST_MPL_PP_PARAMS(i,T) > \
    , N \
--- a/include/boost/mpl/aux_/fold_impl_body.hpp
+++ b/include/boost/mpl/aux_/fold_impl_body.hpp
@@ -49,7 +49,7 @@ namespace boost { namespace mpl { namespace aux {

 /// forward declaration
 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
    , typename First
    , typename Last
    , typename State
@@ -67,7 +67,7 @@ struct AUX778076_FOLD_IMPL_NAME;

 // implementation for N that exceeds BOOST_MPL_LIMIT_UNROLLING
 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
    , typename First
    , typename Last
    , typename State
@@ -129,7 +129,7 @@ struct AUX778076_FOLD_IMPL_NAME<-1,Last,Last,State,ForwardOp>
 // Borland have some serious problems with the unrolled version, so
 // we always use a basic implementation
 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
    , typename First
    , typename Last
    , typename State
@@ -151,7 +151,7 @@ struct AUX778076_FOLD_IMPL_NAME
 };

 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
     , typename Last
    , typename State
    , typename ForwardOp
@@ -167,7 +167,7 @@ struct AUX778076_FOLD_IMPL_NAME<N,Last,Last,State,ForwardOp >
 
 #else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

-template< BOOST_MPL_AUX_NTTP_DECL(int, N) >
+template< int N >
 struct AUX778076_FOLD_CHUNK_NAME;

 #   define BOOST_PP_ITERATION_PARAMS_1 \
@@ -175,7 +175,7 @@ struct AUX778076_FOLD_CHUNK_NAME;
 #   include BOOST_PP_ITERATE()

 // implementation for N that exceeds BOOST_MPL_LIMIT_UNROLLING
-template< BOOST_MPL_AUX_NTTP_DECL(int, N) > 
+template< int N > 
 struct AUX778076_FOLD_CHUNK_NAME
 {
    template<
@@ -270,7 +270,7 @@ struct BOOST_PP_CAT(AUX778076_FOLD_IMPL_NAME_PREFIX,_step)
 };

 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
    , typename First
    , typename Last
    , typename State
--- a/include/boost/mpl/aux_/integral_wrapper.hpp
+++ b/include/boost/mpl/aux_/integral_wrapper.hpp
@@ -26,7 +26,7 @@
 #endif

 #if !defined(AUX_WRAPPER_PARAMS)
-#   define AUX_WRAPPER_PARAMS(N) BOOST_MPL_AUX_NTTP_DECL(AUX_WRAPPER_VALUE_TYPE, N)
+#   define AUX_WRAPPER_PARAMS(N) AUX_WRAPPER_VALUE_TYPE N
 #endif

 #if !defined(AUX_WRAPPER_INST)
--- a/include/boost/mpl/aux_/na_spec.hpp
+++ b/include/boost/mpl/aux_/na_spec.hpp
@@ -41,7 +41,7 @@
 #if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 #   define BOOST_MPL_AUX_NA_SPEC_ARITY(i, name) \
 namespace aux { \
-template< BOOST_MPL_AUX_NTTP_DECL(int, N) > \
+template< int N > \
 struct arity< \
          name< BOOST_MPL_AUX_NA_PARAMS(i) > \
        , N \
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
@@ -13,7 +13,7 @@ namespace boost { namespace mpl {

 namespace aux {

-template< BOOST_MPL_AUX_NTTP_DECL(int, size) > struct unpack_args_impl
+template< int size > struct unpack_args_impl
 {
    template< typename F, typename Args > struct apply;
 };
--- a/include/boost/mpl/aux_/reverse_fold_impl_body.hpp
+++ b/include/boost/mpl/aux_/reverse_fold_impl_body.hpp
@@ -68,7 +68,7 @@ namespace boost { namespace mpl { namespace aux {

 /// forward declaration
 template<
-      BOOST_MPL_AUX_NTTP_DECL(long, N)
+      long N
    , typename First
    , typename Last
    , typename State
@@ -86,7 +86,7 @@ struct AUX778076_FOLD_IMPL_NAME;

 // implementation for N that exceeds BOOST_MPL_LIMIT_UNROLLING
 template<
-      BOOST_MPL_AUX_NTTP_DECL(long, N)
+      long N
    , typename First
    , typename Last
    , typename State
@@ -167,7 +167,7 @@ struct AUX778076_FOLD_IMPL_NAME<-1,Last,Last,State,BackwardOp,ForwardOp>

 #else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

-template< BOOST_MPL_AUX_NTTP_DECL(long, N) >
+template< long N >
 struct AUX778076_FOLD_CHUNK_NAME;

 #   define BOOST_PP_ITERATION_PARAMS_1 \
@@ -175,7 +175,7 @@ struct AUX778076_FOLD_CHUNK_NAME;
 #   include BOOST_PP_ITERATE()

 // implementation for N that exceeds BOOST_MPL_LIMIT_UNROLLING
-template< BOOST_MPL_AUX_NTTP_DECL(long, N) > 
+template< long N > 
 struct AUX778076_FOLD_CHUNK_NAME
 {
    template<
@@ -289,7 +289,7 @@ struct BOOST_PP_CAT(AUX778076_FOLD_IMPL_NAME_PREFIX,_step)
 };

 template<
-      BOOST_MPL_AUX_NTTP_DECL(long, N)
+      long N
    , typename First
    , typename Last
    , typename State
--- a/include/boost/mpl/aux_/sequence_wrapper.hpp
+++ b/include/boost/mpl/aux_/sequence_wrapper.hpp
@@ -93,7 +93,7 @@ namespace boost { namespace mpl {
 #else // AUX778076_SEQUENCE_INTEGRAL_WRAPPER

 #   define AUX778076_SEQUENCE_PARAM_NAME C
-#   define AUX778076_SEQUENCE_TEMPLATE_PARAM BOOST_MPL_AUX_NTTP_DECL(long, C)
+#   define AUX778076_SEQUENCE_TEMPLATE_PARAM long C
 #   define AUX778076_SEQUENCE_DEFAULT LONG_MAX

 #   define AUX778076_SEQUENCE_PARAMS() \
@@ -154,7 +154,7 @@ template<
 struct AUX778076_SEQUENCE_NAME;
 #else
 namespace aux {
-template< BOOST_MPL_AUX_NTTP_DECL(int, N) > 
+template< int N > 
 struct BOOST_PP_CAT(AUX778076_SEQUENCE_NAME,_chooser);
 }
 #endif
--- a/include/boost/mpl/aux_/single_element_iter.hpp
+++ b/include/boost/mpl/aux_/single_element_iter.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace mpl {

 namespace aux {

-template< typename T, BOOST_MPL_AUX_NTTP_DECL(int, is_last_) >
+template< typename T, int is_last_ >
 struct sel_iter;

 template< typename T >
@@ -50,7 +50,7 @@ struct sel_iter<T,1>

 } // namespace aux

-template< typename T, BOOST_MPL_AUX_NTTP_DECL(int, is_last_), typename Distance >
+template< typename T, int is_last_, typename Distance >
 struct advance< aux::sel_iter<T,is_last_>,Distance>
 {
    typedef aux::sel_iter<
@@ -61,8 +61,8 @@ struct advance< aux::sel_iter<T,is_last_>,Distance>

 template< 
      typename T
-    , BOOST_MPL_AUX_NTTP_DECL(int, l1)
-    , BOOST_MPL_AUX_NTTP_DECL(int, l2) 
+    , int l1
+    , int l2 
    >
 struct distance< aux::sel_iter<T,l1>, aux::sel_iter<T,l2> >
    : int_<( l2 - l1 )>
@@ -75,7 +75,7 @@ namespace aux {

 struct sel_iter_tag;

-template< typename T, BOOST_MPL_AUX_NTTP_DECL(int, is_last_) >
+template< typename T, int is_last_ >
 struct sel_iter
 {
    enum { pos_ = is_last_ };
--- a/include/boost/mpl/aux_/template_arity.hpp
+++ b/include/boost/mpl/aux_/template_arity.hpp
@@ -63,7 +63,7 @@

 namespace boost { namespace mpl { namespace aux {

-template< BOOST_MPL_AUX_NTTP_DECL(int, N) > struct arity_tag
+template< int N > struct arity_tag
 {
    typedef char (&type)[N + 1];
 };
@@ -73,7 +73,7 @@ template< BOOST_MPL_AUX_NTTP_DECL(int, N) > struct arity_tag
 /**/

 template<
-      BOOST_MPL_PP_PARAMS(AUX778076_ARITY, BOOST_MPL_AUX_NTTP_DECL(int, C))
+      BOOST_MPL_PP_PARAMS(AUX778076_ARITY, int C)
    >
 struct max_arity
 {
@@ -94,7 +94,7 @@ arity_tag<0>::type arity_helper(...);
 #   define BOOST_PP_FILENAME_1 <boost/mpl/aux_/template_arity.hpp>
 #   include BOOST_PP_ITERATE()

-template< typename F, BOOST_MPL_AUX_NTTP_DECL(int, N) >
+template< typename F, int N >
 struct template_arity_impl
 {
    BOOST_STATIC_CONSTANT(int, value = 
--- a/include/boost/mpl/aux_/yes_no.hpp
+++ b/include/boost/mpl/aux_/yes_no.hpp
@@ -36,7 +36,7 @@ template<> struct yes_no_tag<true>
 };


-template< BOOST_MPL_AUX_NTTP_DECL(long, n) > struct weighted_tag
+template< long n > struct weighted_tag
 {
    typedef char (&type)[n];
 };
--- a/include/boost/mpl/bind.hpp
+++ b/include/boost/mpl/bind.hpp
@@ -153,7 +153,7 @@ struct replace_unnamed_arg< arg<-1>,Arg >
 #   endif // BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT

 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N), AUX778076_BIND_PARAMS(typename U)
+      int N, AUX778076_BIND_PARAMS(typename U)
    >
 struct resolve_bind_arg< arg<N>,AUX778076_BIND_PARAMS(U) >
 {
@@ -241,7 +241,7 @@ struct replace_unnamed_arg

 // agurt, 10/mar/02: the forward declaration has to appear before any of
 // 'is_bind_helper' overloads, otherwise MSVC6.5 issues an ICE on it
-template< BOOST_MPL_AUX_NTTP_DECL(int, arity_) > struct bind_chooser;
+template< int arity_ > struct bind_chooser;

 aux::no_tag is_bind_helper(...);
 template< typename T > aux::no_tag is_bind_helper(protect<T>*);
@@ -257,7 +257,7 @@ template<
 aux::yes_tag is_bind_helper(bind<F,AUX778076_BIND_PARAMS(T)>*);
 #endif

-template< BOOST_MPL_AUX_NTTP_DECL(int, N) >
+template< int N >
 aux::yes_tag is_bind_helper(arg<N>*);

 template< bool is_ref_ = true >
--- a/include/boost/mpl/char_fwd.hpp
+++ b/include/boost/mpl/char_fwd.hpp
@@ -19,7 +19,7 @@

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN

-template< BOOST_MPL_AUX_NTTP_DECL(char, N) > struct char_;
+template< char N > struct char_;

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
 BOOST_MPL_AUX_ADL_BARRIER_DECL(char_)
--- a/include/boost/mpl/int_fwd.hpp
+++ b/include/boost/mpl/int_fwd.hpp
@@ -19,7 +19,7 @@

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN

-template< BOOST_MPL_AUX_NTTP_DECL(int, N) > struct int_;
+template< int N > struct int_;

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
 BOOST_MPL_AUX_ADL_BARRIER_DECL(int_)
--- a/include/boost/mpl/is_placeholder.hpp
+++ b/include/boost/mpl/is_placeholder.hpp
@@ -32,7 +32,7 @@ struct is_placeholder
 {
 };

-template< BOOST_MPL_AUX_NTTP_DECL(int, N) >
+template< int N >
 struct is_placeholder< arg<N> >
    : bool_<true>
 {
@@ -44,7 +44,7 @@ namespace aux {

 aux::no_tag is_placeholder_helper(...);

-template< BOOST_MPL_AUX_NTTP_DECL(int, N) >
+template< int N >
 aux::yes_tag is_placeholder_helper(aux::type_wrapper< arg<N> >*);

 } // namespace aux
--- a/include/boost/mpl/long_fwd.hpp
+++ b/include/boost/mpl/long_fwd.hpp
@@ -19,7 +19,7 @@

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN

-template< BOOST_MPL_AUX_NTTP_DECL(long, N) > struct long_;
+template< long N > struct long_;

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
 BOOST_MPL_AUX_ADL_BARRIER_DECL(long_)
--- a/include/boost/mpl/map/aux_/iterator.hpp
+++ b/include/boost/mpl/map/aux_/iterator.hpp
@@ -88,15 +88,15 @@ struct next< m_iter<Map,max_order,max_order> >

 template< 
      typename Map
-    , BOOST_MPL_AUX_NTTP_DECL(long, order)
-    , BOOST_MPL_AUX_NTTP_DECL(long, max_order)
+    , long order
+    , long max_order
    >
 struct next_order;

 template< 
      typename Map
-    , BOOST_MPL_AUX_NTTP_DECL(long, order)
-    , BOOST_MPL_AUX_NTTP_DECL(long, max_order)
+    , long order
+    , long max_order
    >
 struct next_order_impl
    : if_< 
@@ -109,8 +109,8 @@ struct next_order_impl

 template< 
      typename Map
-    , BOOST_MPL_AUX_NTTP_DECL(long, order)
-    , BOOST_MPL_AUX_NTTP_DECL(long, max_order)
+    , long order
+    , long max_order
    >
 struct next_order
    : if_c<
@@ -124,8 +124,8 @@ struct next_order

 template<
      typename Map
-    , BOOST_MPL_AUX_NTTP_DECL(long, order)
-    , BOOST_MPL_AUX_NTTP_DECL(long, max_order)
+    , long order
+    , long max_order
    >
 struct m_iter;

@@ -133,8 +133,8 @@ struct m_iter_empty_base {};

 template< 
      typename Map
-    , BOOST_MPL_AUX_NTTP_DECL(long, order)
-    , BOOST_MPL_AUX_NTTP_DECL(long, max_order)
+    , long order
+    , long max_order
    >
 struct m_iter_base
 {
@@ -149,8 +149,8 @@ struct m_iter_base

 template<
      typename Map
-    , BOOST_MPL_AUX_NTTP_DECL(long, order)
-    , BOOST_MPL_AUX_NTTP_DECL(long, max_order)
+    , long order
+    , long max_order
    >
 struct m_iter
  : if_c<
--- a/include/boost/mpl/not.hpp
+++ b/include/boost/mpl/not.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace mpl {

 namespace aux {

-template< BOOST_MPL_AUX_NTTP_DECL(long, C_) > // 'long' is intentional here
+template< long C_ > // 'long' is intentional here
 struct not_impl
    : bool_<!C_>
 {
--- a/include/boost/mpl/protect.hpp
+++ b/include/boost/mpl/protect.hpp
@@ -37,7 +37,7 @@ struct protect : T

 #if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 namespace aux { 
-template< BOOST_MPL_AUX_NTTP_DECL(int, N), typename T >
+template< int N, typename T >
 struct arity< protect<T>, N > 
    : arity<T,N>
 { 
--- a/include/boost/mpl/unpack_args.hpp
+++ b/include/boost/mpl/unpack_args.hpp
@@ -62,7 +62,7 @@ namespace aux {
 template< int size, typename F, typename Args >
 struct unpack_args_impl;
 #else
-template< BOOST_MPL_AUX_NTTP_DECL(int, size) > struct unpack_args_impl
+template< int size > struct unpack_args_impl
 {
    template< typename F, typename Args > struct apply;
 };
--- a/include/boost/mpl/vector/aux_/at.hpp
+++ b/include/boost/mpl/vector/aux_/at.hpp
@@ -59,9 +59,9 @@ struct at_impl< aux::vector_tag >
 #   if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
    && !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)

-template< typename Vector, BOOST_MPL_AUX_NTTP_DECL(long, n_) > struct v_at;
+template< typename Vector, long n_ > struct v_at;

-template< BOOST_MPL_AUX_NTTP_DECL(long, n_) >
+template< long n_ >
 struct at_impl< aux::vector_tag<n_> >
 {
    template< typename Vector, typename N > struct apply
@@ -85,7 +85,7 @@ struct at_impl< aux::vector_tag<n_> >

 namespace aux {

-template< BOOST_MPL_AUX_NTTP_DECL(long, n_) > struct v_at_impl
+template< long n_ > struct v_at_impl
 {
    template< typename V > struct result_;
 };
@@ -101,7 +101,7 @@ template<> struct v_at_impl<-1>

 } // namespace aux

-template< typename T, BOOST_MPL_AUX_NTTP_DECL(long, n_) >
+template< typename T, long n_ >
 struct v_at
    : aux::v_at_impl<n_>::template result_<T>
 {
--- a/include/boost/mpl/vector/aux_/front.hpp
+++ b/include/boost/mpl/vector/aux_/front.hpp
@@ -38,7 +38,7 @@ struct front_impl< aux::vector_tag >

 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)

-template< BOOST_MPL_AUX_NTTP_DECL(long, n_) >
+template< long n_ >
 struct front_impl< aux::vector_tag<n_> >
 {
    template< typename Vector > struct apply
--- a/include/boost/mpl/vector/aux_/iterator.hpp
+++ b/include/boost/mpl/vector/aux_/iterator.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace mpl {

 template<
      typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
+    , long n_
    >
 struct v_iter
 {
@@ -60,7 +60,7 @@ struct v_iter

 template<
      typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
+    , long n_
    >
 struct next< v_iter<Vector,n_> >
 {
@@ -69,7 +69,7 @@ struct next< v_iter<Vector,n_> >

 template<
      typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
+    , long n_
    >
 struct prior< v_iter<Vector,n_> >
 {
@@ -78,7 +78,7 @@ struct prior< v_iter<Vector,n_> >

 template<
      typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
+    , long n_
    , typename Distance
    >
 struct advance< v_iter<Vector,n_>,Distance>
@@ -91,8 +91,8 @@ struct advance< v_iter<Vector,n_>,Distance>

 template< 
      typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
-    , BOOST_MPL_AUX_NTTP_DECL(long, m_)
+    , long n_
+    , long m_
    > 
 struct distance< v_iter<Vector,n_>, v_iter<Vector,m_> >
    : mpl::long_<(m_ - n_)>
--- a/include/boost/mpl/vector/aux_/tag.hpp
+++ b/include/boost/mpl/vector/aux_/tag.hpp
@@ -24,7 +24,7 @@ struct v_iter_tag;
 #if defined(BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES)
 struct vector_tag;
 #else
-template< BOOST_MPL_AUX_NTTP_DECL(long, N) > struct vector_tag;
+template< long N > struct vector_tag;
 #endif

 }}}