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
........


[SVN r49271]
This commit is contained in:
Aleksey Gurtovoy
2008-10-11 06:46:00 +00:00
parent f0c26b3f47
commit 3abcd697ff
2 changed files with 9 additions and 8 deletions

View File

@@ -5,7 +5,7 @@
///// header body ///// header body
// Copyright Aleksey Gurtovoy 2000-2004 // Copyright Aleksey Gurtovoy 2000-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -124,13 +124,13 @@ namespace boost { namespace mpl {
BOOST_PP_ENUM_PARAMS(n, AUX778076_SEQUENCE_TEMPLATE_PARAM) \ BOOST_PP_ENUM_PARAMS(n, AUX778076_SEQUENCE_TEMPLATE_PARAM) \
/**/ /**/
# define AUX778076_CONVERT_CN_TO(z,n,TARGET) \ # if !defined(AUX778076_SEQUENCE_CONVERT_CN_TO)
TARGET(BOOST_PP_CAT(C,n)) \ # define AUX778076_SEQUENCE_CONVERT_CN_TO(z,n,TARGET) BOOST_PP_CAT(C,n)
/**/ # endif
# define AUX778076_SEQUENCE_N_ARGS(n) \ # define AUX778076_SEQUENCE_N_ARGS(n) \
T BOOST_PP_COMMA_IF(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) \ # define AUX778076_SEQUENCE_N_PARTIAL_SPEC_ARGS(n) \
@@ -207,8 +207,8 @@ struct AUX778076_SEQUENCE_NAME
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
# undef AUX778076_SEQUENCE_N_PARTIAL_SPEC_ARGS # undef AUX778076_SEQUENCE_N_PARTIAL_SPEC_ARGS
# undef AUX778076_CONVERT_CN_TO
# undef AUX778076_SEQUENCE_N_ARGS # undef AUX778076_SEQUENCE_N_ARGS
# undef AUX778076_SEQUENCE_CONVERT_CN_TO
# undef AUX778076_SEQUENCE_N_PARAMS # undef AUX778076_SEQUENCE_N_PARAMS
# undef AUX778076_SEQUENCE_DEFAULT_PARAMS # undef AUX778076_SEQUENCE_DEFAULT_PARAMS
# undef AUX778076_SEQUENCE_ARGS # undef AUX778076_SEQUENCE_ARGS

View File

@@ -2,7 +2,7 @@
#ifndef BOOST_MPL_VECTOR_C_HPP_INCLUDED #ifndef BOOST_MPL_VECTOR_C_HPP_INCLUDED
#define 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. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -53,6 +53,7 @@
# define AUX778076_SEQUENCE_NAME vector_c # define AUX778076_SEQUENCE_NAME vector_c
# define AUX778076_SEQUENCE_LIMIT BOOST_MPL_LIMIT_VECTOR_SIZE # 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_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 # define AUX778076_SEQUENCE_INTEGRAL_WRAPPER
# include <boost/mpl/aux_/sequence_wrapper.hpp> # include <boost/mpl/aux_/sequence_wrapper.hpp>