From 16b088bbbdc741eba164241e3c5dc687595061a7 Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Thu, 13 Mar 2003 12:28:49 +0000 Subject: [PATCH] merge fixes from the main trunk [SVN r17887] --- include/boost/type_traits/detail/size_t_trait_def.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/type_traits/detail/size_t_trait_def.hpp b/include/boost/type_traits/detail/size_t_trait_def.hpp index 36d18a2..d3890e8 100644 --- a/include/boost/type_traits/detail/size_t_trait_def.hpp +++ b/include/boost/type_traits/detail/size_t_trait_def.hpp @@ -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 @@ -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 \ - : 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 \ #define BOOST_TT_AUX_SIZE_T_TRAIT_PARTIAL_SPEC1_1(param,trait,spec,C) \ template< param > struct trait \ - : mpl::size_t_c< C > \ + : mpl::size_t< C > \ { \ }; \ /**/