[Boost-commit] svn:boost r49271 - in branches/release: . boost/mpl boost/mpl/aux_

Subject: [Boost-commit] svn:boost r49271 - in branches/release: . boost/mpl boost/mpl/aux_
From: agurtovoy_at_[hidden]
Date: 2008-10-11 02:46:00

Author: agurtovoy
Date: 2008-10-11 02:46:00 EDT (Sat, 11 Oct 2008)
New Revision: 49271
URL: http://svn.boost.org/trac/boost/changeset/49271

Log:
Merged revisions 49245 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r49245 | agurtovoy | 2008-10-10 05:23:28 -0500 (Fri, 10 Oct 2008) | 1 line
  
  Okay, it was partially tested, on vector_c only. Restore it conditionally
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/mpl/aux_/sequence_wrapper.hpp |    14 +++++++-------                          
   branches/release/boost/mpl/vector_c.hpp              |     3 ++-                                     
   2 files changed, 9 insertions(+), 8 deletions(-)

Modified: branches/release/boost/mpl/aux_/sequence_wrapper.hpp
==============================================================================
--- branches/release/boost/mpl/aux_/sequence_wrapper.hpp	(original)
+++ branches/release/boost/mpl/aux_/sequence_wrapper.hpp	2008-10-11 02:46:00 EDT (Sat, 11 Oct 2008)
@@ -5,7 +5,7 @@
 
 ///// header body
 
-// Copyright Aleksey Gurtovoy 2000-2004
+// Copyright Aleksey Gurtovoy 2000-2008
 //
 // Distributed under the Boost Software License, Version 1.0. 
 // (See accompanying file LICENSE_1_0.txt or copy at 
@@ -124,13 +124,13 @@
     BOOST_PP_ENUM_PARAMS(n, AUX778076_SEQUENCE_TEMPLATE_PARAM) \
     /**/
 
-#   define AUX778076_CONVERT_CN_TO(z,n,TARGET) \
-    TARGET(BOOST_PP_CAT(C,n)) \
-    /**/
-    
+#   if !defined(AUX778076_SEQUENCE_CONVERT_CN_TO)
+#       define AUX778076_SEQUENCE_CONVERT_CN_TO(z,n,TARGET) BOOST_PP_CAT(C,n)
+#   endif
+
 #   define AUX778076_SEQUENCE_N_ARGS(n) \
     T BOOST_PP_COMMA_IF(n) \
-    BOOST_PP_ENUM(n,AUX778076_CONVERT_CN_TO,T) \
+    BOOST_PP_ENUM(n,AUX778076_SEQUENCE_CONVERT_CN_TO,T) \
     /**/
 
 #   define AUX778076_SEQUENCE_N_PARTIAL_SPEC_ARGS(n) \
@@ -207,8 +207,8 @@
 #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
 #   undef AUX778076_SEQUENCE_N_PARTIAL_SPEC_ARGS
-#   undef AUX778076_CONVERT_CN_TO
 #   undef AUX778076_SEQUENCE_N_ARGS
+#   undef AUX778076_SEQUENCE_CONVERT_CN_TO
 #   undef AUX778076_SEQUENCE_N_PARAMS
 #   undef AUX778076_SEQUENCE_DEFAULT_PARAMS
 #   undef AUX778076_SEQUENCE_ARGS

Modified: branches/release/boost/mpl/vector_c.hpp
==============================================================================
--- branches/release/boost/mpl/vector_c.hpp	(original)
+++ branches/release/boost/mpl/vector_c.hpp	2008-10-11 02:46:00 EDT (Sat, 11 Oct 2008)
@@ -2,7 +2,7 @@
 #ifndef BOOST_MPL_VECTOR_C_HPP_INCLUDED
 #define BOOST_MPL_VECTOR_C_HPP_INCLUDED
 
-// Copyright Aleksey Gurtovoy 2000-2004
+// Copyright Aleksey Gurtovoy 2000-2008
 //
 // Distributed under the Boost Software License, Version 1.0. 
 // (See accompanying file LICENSE_1_0.txt or copy at 
@@ -53,6 +53,7 @@
 #   define AUX778076_SEQUENCE_NAME vector_c
 #   define AUX778076_SEQUENCE_LIMIT BOOST_MPL_LIMIT_VECTOR_SIZE
 #   define AUX778076_SEQUENCE_NAME_N(n) BOOST_PP_CAT(BOOST_PP_CAT(vector,n),_c)
+#   define AUX778076_SEQUENCE_CONVERT_CN_TO(z,n,TARGET) TARGET(BOOST_PP_CAT(C,n))
 #   define AUX778076_SEQUENCE_INTEGRAL_WRAPPER
 #   include <boost/mpl/aux_/sequence_wrapper.hpp>