merge fixes from the main trunk

[SVN r17887]
This commit is contained in:
Aleksey Gurtovoy
2003-03-13 12:28:49 +00:00
parent d7831e06a2
commit 16b088bbbd

View File

@ -17,7 +17,7 @@
// no include guards, the header is intended for multiple inclusion!
#include "boost/type_traits/detail/template_arity_spec.hpp"
#include "boost/mpl/size_t_c.hpp"
#include "boost/mpl/size_t.hpp"
#include "boost/mpl/aux_/lambda_support.hpp"
#include <cstddef>
@ -26,7 +26,7 @@
# define BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) /**/
#else
# define BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) \
typedef mpl::size_t_c< C > base_; \
typedef mpl::size_t< C > base_; \
using base_::value; \
/**/
#endif
@ -34,7 +34,7 @@
#define BOOST_TT_AUX_SIZE_T_TRAIT_DEF1(trait,T,C) \
template< typename T > struct trait \
: mpl::size_t_c< C > \
: mpl::size_t< C > \
{ \
BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) \
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,trait,(T)) \
@ -45,7 +45,7 @@ BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,trait) \
#define BOOST_TT_AUX_SIZE_T_TRAIT_SPEC1(trait,spec,C) \
template<> struct trait<spec> \
: mpl::size_t_c< C > \
: mpl::size_t< C > \
{ \
BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) \
BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(1,trait,(spec)) \
@ -54,7 +54,7 @@ template<> struct trait<spec> \
#define BOOST_TT_AUX_SIZE_T_TRAIT_PARTIAL_SPEC1_1(param,trait,spec,C) \
template< param > struct trait<spec> \
: mpl::size_t_c< C > \
: mpl::size_t< C > \
{ \
}; \
/**/