merged from main trunk
[SVN r15765]
This commit is contained in:
1 parent
a716f88479
commit
db832a45e3
363 files changed
+2048
-76773
No files matched your search
@@ -22,7 +22,7 @@
|
||||
#include "boost/mpl/vector/aux_/item.hpp"
|
||||
#include "boost/mpl/vector/aux_/tag.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
#include "boost/config.hpp"
|
||||
#include "boost/mpl/aux_/config/ctps.hpp"
|
||||
|
||||
namespace boost {
|
||||
namespace mpl {
|
||||
@@ -32,7 +32,7 @@ namespace mpl {
|
||||
template<>
|
||||
struct at_traits< aux::vector_tag >
|
||||
{
|
||||
template< typename N, typename Vector > struct algorithm
|
||||
template< typename Vector, typename N > struct algorithm
|
||||
: vector_item<
|
||||
Vector
|
||||
, BOOST_MPL_AUX_VALUE_WKND(N)::value
|
||||
@@ -43,12 +43,13 @@ struct at_traits< aux::vector_tag >
|
||||
|
||||
#else
|
||||
|
||||
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
|
||||
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
|
||||
&& !defined(BOOST_NO_NON_TYPE_TEMPLATE_PARTIAL_SPECIALIZATION)
|
||||
|
||||
template< long S >
|
||||
struct at_traits< aux::vector_tag<S> >
|
||||
{
|
||||
template< typename N, typename Vector > struct algorithm
|
||||
template< typename Vector, typename N > struct algorithm
|
||||
#if !defined(__BORLANDC__)
|
||||
: vector_item<
|
||||
Vector
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "boost/mpl/integral_c.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
#include "boost/config.hpp"
|
||||
#include "boost/mpl/aux_/config/ctps.hpp"
|
||||
|
||||
namespace boost {
|
||||
namespace mpl {
|
||||
@@ -35,7 +35,10 @@ struct vector_item
|
||||
|
||||
#else
|
||||
|
||||
# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
|
||||
// agurt, 29/sep/02: Borland 5.5.1 does a poor job on partial
|
||||
// specialization here
|
||||
# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
|
||||
&& !defined(BOOST_NO_NON_TYPE_TEMPLATE_PARTIAL_SPECIALIZATION)
|
||||
|
||||
// forward declaration
|
||||
template< typename T, long N >
|
||||
|
||||
@@ -63,11 +63,11 @@ struct BOOST_PP_CAT(vector,i)
|
||||
typedef aux::vector_tag<i> tag;
|
||||
typedef BOOST_PP_CAT(vector,i) type;
|
||||
|
||||
# define AUX_VECTOR_ITEM(i, unused) \
|
||||
# define AUX_VECTOR_ITEM(unused, i, unused2) \
|
||||
typedef BOOST_PP_CAT(T,i) BOOST_PP_CAT(item,i); \
|
||||
/**/
|
||||
|
||||
BOOST_PP_REPEAT_1ST(i, AUX_VECTOR_ITEM, unused)
|
||||
BOOST_PP_REPEAT_1(i, AUX_VECTOR_ITEM, unused)
|
||||
# undef AUX_VECTOR_ITEM
|
||||
typedef void_ BOOST_PP_CAT(item,i);
|
||||
typedef BOOST_PP_CAT(T,BOOST_PP_DEC(i)) back;
|
||||
@@ -103,7 +103,8 @@ struct pop_front_traits< aux::vector_tag<i> >
|
||||
|
||||
# endif // i > 0
|
||||
|
||||
# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
|
||||
# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
|
||||
&& !defined(BOOST_NO_NON_TYPE_TEMPLATE_PARTIAL_SPECIALIZATION)
|
||||
|
||||
template< typename V >
|
||||
struct vector_item<V,i>
|
||||
@@ -123,13 +124,23 @@ template<> struct vector_item_impl<i>
|
||||
};
|
||||
}
|
||||
|
||||
template<>
|
||||
struct at_traits< aux::vector_tag<i> >
|
||||
{
|
||||
template< typename V, typename N > struct algorithm
|
||||
{
|
||||
typedef typename aux::vector_item_impl<BOOST_MPL_AUX_VALUE_WKND(N)::value>
|
||||
::template result_<V>::type type;
|
||||
};
|
||||
};
|
||||
|
||||
#if i > 0
|
||||
template<>
|
||||
struct front_traits< aux::vector_tag<i> >
|
||||
{
|
||||
template< typename Vector > struct algorithm
|
||||
{
|
||||
typedef typename Vector::front type;
|
||||
typedef typename Vector::item0 type;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ struct BOOST_PP_CAT(BOOST_PP_CAT(vector,i),_c)
|
||||
|
||||
#else // "brute force" implementation
|
||||
|
||||
# define MPL_AUX_VECTOR_C_PARAM_FUNC(i,param) \
|
||||
# define MPL_AUX_VECTOR_C_PARAM_FUNC(unused, i, param) \
|
||||
BOOST_PP_COMMA_IF(i) \
|
||||
integral_c<T,BOOST_PP_CAT(param,i)> \
|
||||
/**/
|
||||
@@ -62,7 +62,7 @@ template<
|
||||
, BOOST_PP_ENUM_PARAMS(i, T C)
|
||||
>
|
||||
struct BOOST_PP_CAT(BOOST_PP_CAT(vector,i),_c)
|
||||
: BOOST_PP_CAT(vector,i)< BOOST_PP_REPEAT_1ST(i,MPL_AUX_VECTOR_C_PARAM_FUNC,C) >
|
||||
: BOOST_PP_CAT(vector,i)< BOOST_PP_REPEAT_1(i,MPL_AUX_VECTOR_C_PARAM_FUNC,C) >
|
||||
{
|
||||
};
|
||||
|
||||
|
||||
@@ -22,20 +22,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector10.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector10.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector10.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -23,20 +23,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector10_c.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector10_c.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector10_c.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -22,20 +22,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector20.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector20.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector20.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -23,20 +23,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector20_c.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector20_c.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector20_c.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -22,20 +22,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector30.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector30.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector30.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -23,20 +23,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector30_c.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector30_c.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector30_c.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -22,20 +22,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector40.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector40.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector40.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -23,20 +23,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector40_c.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector40_c.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector40_c.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -22,20 +22,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector50.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector50.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector50.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
@@ -23,20 +23,17 @@
|
||||
#endif
|
||||
|
||||
#include "boost/mpl/aux_/config/use_preprocessed.hpp"
|
||||
#include "boost/mpl/aux_/config/vector.hpp"
|
||||
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) && \
|
||||
!defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
#if defined(BOOST_MPL_USE_PREPROCESSED_HEADERS) \
|
||||
&& !defined(BOOST_MPL_PREPROCESSING_MODE)
|
||||
|
||||
# if !defined(BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL)
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector50_c.hpp
|
||||
# else
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER lite_vector50_c.hpp
|
||||
# endif
|
||||
# include "boost/mpl/aux_/include_preprocessed.hpp"
|
||||
# define BOOST_MPL_PREPROCESSED_HEADER vector50_c.hpp
|
||||
# include "boost/mpl/vector/aux_/include_preprocessed.hpp"
|
||||
|
||||
#else
|
||||
|
||||
# include "boost/mpl/aux_/config/vector.hpp"
|
||||
# include "boost/mpl/aux_/config/ctps.hpp"
|
||||
# include "boost/preprocessor/iterate.hpp"
|
||||
# include "boost/config.hpp"
|
||||
|
||||
|
||||
Reference in new issue
Block a user