merge RC_1_32_0 fixes
[SVN r26325]
This commit is contained in:
1 parent
130ab6a9d3
commit
3b04dada5d
41 files changed
+922
-412
No files matched your search
@@ -21,28 +21,28 @@
|
||||
#include <boost/preprocessor/stringize.hpp>
|
||||
|
||||
#if defined(BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES)
|
||||
# define AUX_VECTOR_INCLIDE_DIR typeof_based
|
||||
# define AUX778076_INCLUDE_DIR typeof_based
|
||||
#elif defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
|
||||
|| defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC)
|
||||
# define AUX_VECTOR_INCLIDE_DIR no_ctps
|
||||
# define AUX778076_INCLUDE_DIR no_ctps
|
||||
#else
|
||||
# define AUX_VECTOR_INCLIDE_DIR plain
|
||||
# define AUX778076_INCLUDE_DIR plain
|
||||
#endif
|
||||
|
||||
#if !defined(BOOST_NEEDS_TOKEN_PASTING_OP_FOR_TOKENS_JUXTAPOSING)
|
||||
# define AUX_PREPROCESSED_HEADER \
|
||||
AUX_VECTOR_INCLIDE_DIR/BOOST_MPL_PREPROCESSED_HEADER \
|
||||
# define AUX778076_HEADER \
|
||||
AUX778076_INCLUDE_DIR/BOOST_MPL_PREPROCESSED_HEADER \
|
||||
/**/
|
||||
#else
|
||||
# define AUX_PREPROCESSED_HEADER \
|
||||
BOOST_PP_CAT(AUX_VECTOR_INCLIDE_DIR,/)##BOOST_MPL_PREPROCESSED_HEADER \
|
||||
# define AUX778076_HEADER \
|
||||
BOOST_PP_CAT(AUX778076_INCLUDE_DIR,/)##BOOST_MPL_PREPROCESSED_HEADER \
|
||||
/**/
|
||||
#endif
|
||||
|
||||
|
||||
# include BOOST_PP_STRINGIZE(boost/mpl/vector/aux_/preprocessed/AUX_PREPROCESSED_HEADER)
|
||||
# include BOOST_PP_STRINGIZE(boost/mpl/vector/aux_/preprocessed/AUX778076_HEADER)
|
||||
|
||||
# undef AUX_PREPROCESSED_HEADER
|
||||
# undef AUX_VECTOR_INCLIDE_DIR
|
||||
# undef AUX778076_HEADER
|
||||
# undef AUX778076_INCLUDE_DIR
|
||||
|
||||
#undef BOOST_MPL_PREPROCESSED_HEADER
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <boost/mpl/distance_fwd.hpp>
|
||||
#include <boost/mpl/next.hpp>
|
||||
#include <boost/mpl/prior.hpp>
|
||||
#include <boost/mpl/aux_/iterator_names.hpp>
|
||||
#include <boost/mpl/aux_/nttp_decl.hpp>
|
||||
#include <boost/mpl/aux_/value_wknd.hpp>
|
||||
#include <boost/mpl/aux_/config/ctps.hpp>
|
||||
@@ -114,6 +113,15 @@ template<> struct advance_impl<aux::v_iter_tag>
|
||||
};
|
||||
};
|
||||
|
||||
template<> struct distance_impl<aux::v_iter_tag>
|
||||
{
|
||||
template< typename Iter1, typename Iter2 > struct apply
|
||||
{
|
||||
enum { pos1_ = Iter1::pos_, pos2_ = Iter2::pos_ };
|
||||
typedef long_<( pos2_ - pos1_ )> type;
|
||||
BOOST_STATIC_CONSTANT(long, value = ( pos2_ - pos1_ ));
|
||||
};
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ struct BOOST_PP_CAT(BOOST_PP_CAT(vector,i_),_c)
|
||||
>
|
||||
{
|
||||
typedef BOOST_PP_CAT(BOOST_PP_CAT(vector,i_),_c) type;
|
||||
typedef T value_type;
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -63,6 +64,8 @@ template<
|
||||
struct BOOST_PP_CAT(BOOST_PP_CAT(vector,i_),_c)
|
||||
: BOOST_PP_CAT(vector,i_)< BOOST_PP_REPEAT(i_,AUX778076_VECTOR_C_PARAM_FUNC,C) >
|
||||
{
|
||||
typedef BOOST_PP_CAT(BOOST_PP_CAT(vector,i_),_c) type;
|
||||
typedef T value_type;
|
||||
};
|
||||
|
||||
# undef AUX778076_VECTOR_C_PARAM_FUNC
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
// $Revision$
|
||||
|
||||
#include <boost/mpl/aux_/config/typeof.hpp>
|
||||
#include <boost/mpl/aux_/nttp_decl.hpp>
|
||||
|
||||
namespace boost { namespace mpl { namespace aux {
|
||||
|
||||
@@ -23,7 +24,7 @@ struct v_iter_tag;
|
||||
#if defined(BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES)
|
||||
struct vector_tag;
|
||||
#else
|
||||
template< long N > struct vector_tag;
|
||||
template< BOOST_MPL_AUX_NTTP_DECL(long, N) > struct vector_tag;
|
||||
#endif
|
||||
|
||||
}}}
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
// $Revision$
|
||||
|
||||
#include <boost/mpl/vector/vector0.hpp>
|
||||
#include <boost/mpl/integral_c.hpp>
|
||||
|
||||
namespace boost { namespace mpl {
|
||||
|
||||
@@ -22,6 +23,7 @@ template< typename T > struct vector0_c
|
||||
: vector0<>
|
||||
{
|
||||
typedef vector0_c type;
|
||||
typedef T value_type;
|
||||
};
|
||||
|
||||
}}
|
||||
|
||||
Reference in new issue
Block a user