[Boost-commit] svn:boost r85958 - in trunk/boost/mpl: . aux_ aux_/preprocessed/no_ctps map/aux_ vector/aux_

Subject: [Boost-commit] svn:boost r85958 - in trunk/boost/mpl: . aux_ aux_/preprocessed/no_ctps map/aux_ vector/aux_
From: steveire_at_[hidden]
Date: 2013-09-26 09:07:02

Author: skelly
Date: 2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)
New Revision: 85958
URL: http://svn.boost.org/trac/boost/changeset/85958

Log:
MPL: Remove use of obsolete macro.

Text files modified: 
   trunk/boost/mpl/advance.hpp                               |     2 +-                                      
   trunk/boost/mpl/arg_fwd.hpp                               |     2 +-                                      
   trunk/boost/mpl/assert.hpp                                |     2 +-                                      
   trunk/boost/mpl/at.hpp                                    |     2 +-                                      
   trunk/boost/mpl/aux_/advance_backward.hpp                 |     4 ++--                                    
   trunk/boost/mpl/aux_/advance_forward.hpp                  |     4 ++--                                    
   trunk/boost/mpl/aux_/arity.hpp                            |     2 +-                                      
   trunk/boost/mpl/aux_/arity_spec.hpp                       |     2 +-                                      
   trunk/boost/mpl/aux_/fold_impl_body.hpp                   |    14 +++++++-------                          
   trunk/boost/mpl/aux_/integral_wrapper.hpp                 |     2 +-                                      
   trunk/boost/mpl/aux_/na_spec.hpp                          |     2 +-                                      
   trunk/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp |     2 +-                                      
   trunk/boost/mpl/aux_/reverse_fold_impl_body.hpp           |    10 +++++-----                              
   trunk/boost/mpl/aux_/sequence_wrapper.hpp                 |     4 ++--                                    
   trunk/boost/mpl/aux_/single_element_iter.hpp              |    10 +++++-----                              
   trunk/boost/mpl/aux_/template_arity.hpp                   |     6 +++---                                  
   trunk/boost/mpl/aux_/yes_no.hpp                           |     2 +-                                      
   trunk/boost/mpl/bind.hpp                                  |     6 +++---                                  
   trunk/boost/mpl/char_fwd.hpp                              |     2 +-                                      
   trunk/boost/mpl/int_fwd.hpp                               |     2 +-                                      
   trunk/boost/mpl/is_placeholder.hpp                        |     4 ++--                                    
   trunk/boost/mpl/long_fwd.hpp                              |     2 +-                                      
   trunk/boost/mpl/map/aux_/iterator.hpp                     |    24 ++++++++++++------------                
   trunk/boost/mpl/not.hpp                                   |     2 +-                                      
   trunk/boost/mpl/protect.hpp                               |     2 +-                                      
   trunk/boost/mpl/unpack_args.hpp                           |     2 +-                                      
   trunk/boost/mpl/vector/aux_/at.hpp                        |     8 ++++----                                
   trunk/boost/mpl/vector/aux_/front.hpp                     |     2 +-                                      
   trunk/boost/mpl/vector/aux_/iterator.hpp                  |    12 ++++++------                            
   trunk/boost/mpl/vector/aux_/tag.hpp                       |     2 +-                                      
   30 files changed, 71 insertions(+), 71 deletions(-)

Modified: trunk/boost/mpl/advance.hpp
==============================================================================
--- trunk/boost/mpl/advance.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/advance.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -61,7 +61,7 @@
 
 template<
       typename Iterator
-    , BOOST_MPL_AUX_NTTP_DECL(long, N)
+    , long N
     >
 struct advance_c
     : advance_impl< typename tag<Iterator>::type >

Modified: trunk/boost/mpl/arg_fwd.hpp
==============================================================================
--- trunk/boost/mpl/arg_fwd.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/arg_fwd.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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)

Modified: trunk/boost/mpl/assert.hpp
==============================================================================
--- trunk/boost/mpl/assert.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/assert.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -116,7 +116,7 @@
 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

Modified: trunk/boost/mpl/at.hpp
==============================================================================
--- trunk/boost/mpl/at.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/at.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -37,7 +37,7 @@
 
 template<
       typename Sequence
-    , BOOST_MPL_AUX_NTTP_DECL(long, N)
+    , long N
     >
 struct at_c
     : at_impl< typename sequence_tag<Sequence>::type >

Modified: trunk/boost/mpl/aux_/advance_backward.hpp
==============================================================================
--- trunk/boost/mpl/aux_/advance_backward.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/advance_backward.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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

Modified: trunk/boost/mpl/aux_/advance_forward.hpp
==============================================================================
--- trunk/boost/mpl/aux_/advance_forward.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/advance_forward.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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

Modified: trunk/boost/mpl/aux_/arity.hpp
==============================================================================
--- trunk/boost/mpl/aux_/arity.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/arity.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -26,7 +26,7 @@
 // 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);

Modified: trunk/boost/mpl/aux_/arity_spec.hpp
==============================================================================
--- trunk/boost/mpl/aux_/arity_spec.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/arity_spec.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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 \

Modified: trunk/boost/mpl/aux_/fold_impl_body.hpp
==============================================================================
--- trunk/boost/mpl/aux_/fold_impl_body.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/fold_impl_body.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -49,7 +49,7 @@
 
 /// forward declaration
 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
     , typename First
     , typename Last
     , typename State
@@ -67,7 +67,7 @@
 
 // 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 @@
 // 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 @@
 };
 
 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
      , typename Last
     , typename State
     , typename ForwardOp
@@ -167,7 +167,7 @@
  
 #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 @@
 #   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 @@
 };
 
 template<
-      BOOST_MPL_AUX_NTTP_DECL(int, N)
+      int N
     , typename First
     , typename Last
     , typename State

Modified: trunk/boost/mpl/aux_/integral_wrapper.hpp
==============================================================================
--- trunk/boost/mpl/aux_/integral_wrapper.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/integral_wrapper.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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)

Modified: trunk/boost/mpl/aux_/na_spec.hpp
==============================================================================
--- trunk/boost/mpl/aux_/na_spec.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/na_spec.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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 \

Modified: trunk/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
==============================================================================
--- trunk/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -13,7 +13,7 @@
 
 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;
 };

Modified: trunk/boost/mpl/aux_/reverse_fold_impl_body.hpp
==============================================================================
--- trunk/boost/mpl/aux_/reverse_fold_impl_body.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/reverse_fold_impl_body.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -68,7 +68,7 @@
 
 /// forward declaration
 template<
-      BOOST_MPL_AUX_NTTP_DECL(long, N)
+      long N
     , typename First
     , typename Last
     , typename State
@@ -86,7 +86,7 @@
 
 // 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 @@
 
 #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 @@
 #   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 @@
 };
 
 template<
-      BOOST_MPL_AUX_NTTP_DECL(long, N)
+      long N
     , typename First
     , typename Last
     , typename State

Modified: trunk/boost/mpl/aux_/sequence_wrapper.hpp
==============================================================================
--- trunk/boost/mpl/aux_/sequence_wrapper.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/sequence_wrapper.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -93,7 +93,7 @@
 #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 @@
 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

Modified: trunk/boost/mpl/aux_/single_element_iter.hpp
==============================================================================
--- trunk/boost/mpl/aux_/single_element_iter.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/single_element_iter.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -30,7 +30,7 @@
 
 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 @@
 
 } // 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 @@
 
 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 @@
 
 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_ };

Modified: trunk/boost/mpl/aux_/template_arity.hpp
==============================================================================
--- trunk/boost/mpl/aux_/template_arity.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/template_arity.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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_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 @@
 #   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 = 

Modified: trunk/boost/mpl/aux_/yes_no.hpp
==============================================================================
--- trunk/boost/mpl/aux_/yes_no.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/aux_/yes_no.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -36,7 +36,7 @@
 };
 
 
-template< BOOST_MPL_AUX_NTTP_DECL(long, n) > struct weighted_tag
+template< long n > struct weighted_tag
 {
     typedef char (&type)[n];
 };

Modified: trunk/boost/mpl/bind.hpp
==============================================================================
--- trunk/boost/mpl/bind.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/bind.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -153,7 +153,7 @@
 #   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 @@
 
 // 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 @@
 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 >

Modified: trunk/boost/mpl/char_fwd.hpp
==============================================================================
--- trunk/boost/mpl/char_fwd.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/char_fwd.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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_)

Modified: trunk/boost/mpl/int_fwd.hpp
==============================================================================
--- trunk/boost/mpl/int_fwd.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/int_fwd.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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_)

Modified: trunk/boost/mpl/is_placeholder.hpp
==============================================================================
--- trunk/boost/mpl/is_placeholder.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/is_placeholder.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -32,7 +32,7 @@
 {
 };
 
-template< BOOST_MPL_AUX_NTTP_DECL(int, N) >
+template< int N >
 struct is_placeholder< arg<N> >
     : bool_<true>
 {
@@ -44,7 +44,7 @@
 
 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

Modified: trunk/boost/mpl/long_fwd.hpp
==============================================================================
--- trunk/boost/mpl/long_fwd.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/long_fwd.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -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_)

Modified: trunk/boost/mpl/map/aux_/iterator.hpp
==============================================================================
--- trunk/boost/mpl/map/aux_/iterator.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/map/aux_/iterator.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -88,15 +88,15 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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<

Modified: trunk/boost/mpl/not.hpp
==============================================================================
--- trunk/boost/mpl/not.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/not.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -24,7 +24,7 @@
 
 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_>
 {

Modified: trunk/boost/mpl/protect.hpp
==============================================================================
--- trunk/boost/mpl/protect.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/protect.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -37,7 +37,7 @@
 
 #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>
 { 

Modified: trunk/boost/mpl/unpack_args.hpp
==============================================================================
--- trunk/boost/mpl/unpack_args.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/unpack_args.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -62,7 +62,7 @@
 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;
 };

Modified: trunk/boost/mpl/vector/aux_/at.hpp
==============================================================================
--- trunk/boost/mpl/vector/aux_/at.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/vector/aux_/at.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -59,9 +59,9 @@
 #   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 @@
 
 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 @@
 
 } // 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>
 {

Modified: trunk/boost/mpl/vector/aux_/front.hpp
==============================================================================
--- trunk/boost/mpl/vector/aux_/front.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/vector/aux_/front.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -38,7 +38,7 @@
 
 #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

Modified: trunk/boost/mpl/vector/aux_/iterator.hpp
==============================================================================
--- trunk/boost/mpl/vector/aux_/iterator.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/vector/aux_/iterator.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -31,7 +31,7 @@
 
 template<
       typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
+    , long n_
     >
 struct v_iter
 {
@@ -60,7 +60,7 @@
 
 template<
       typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
+    , long n_
     >
 struct next< v_iter<Vector,n_> >
 {
@@ -69,7 +69,7 @@
 
 template<
       typename Vector
-    , BOOST_MPL_AUX_NTTP_DECL(long, n_)
+    , long n_
     >
 struct prior< v_iter<Vector,n_> >
 {
@@ -78,7 +78,7 @@
 
 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 @@
 
 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_)>

Modified: trunk/boost/mpl/vector/aux_/tag.hpp
==============================================================================
--- trunk/boost/mpl/vector/aux_/tag.hpp	Thu Sep 26 09:06:05 2013	(r85957)
+++ trunk/boost/mpl/vector/aux_/tag.hpp	2013-09-26 09:07:02 EDT (Thu, 26 Sep 2013)	(r85958)
@@ -24,7 +24,7 @@
 #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
 
 }}}