Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/type_traits/detail/size_t_trait_def.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/type_traits/detail/size_t_trait_def.hpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/3rdParty/Boost/src/boost/type_traits/detail/size_t_trait_def.hpp b/3rdParty/Boost/src/boost/type_traits/detail/size_t_trait_def.hpp index 3be4f70..8cea9b4 100644 --- a/3rdParty/Boost/src/boost/type_traits/detail/size_t_trait_def.hpp +++ b/3rdParty/Boost/src/boost/type_traits/detail/size_t_trait_def.hpp @@ -8,8 +8,8 @@ // http://www.boost.org/LICENSE_1_0.txt) // $Source$ -// $Date: 2011-04-25 05:26:48 -0700 (Mon, 25 Apr 2011) $ -// $Revision: 71481 $ +// $Date$ +// $Revision$ #include <boost/type_traits/detail/template_arity_spec.hpp> #include <boost/type_traits/integral_constant.hpp> @@ -18,24 +18,16 @@ #include <cstddef> -#if !defined(BOOST_MSVC) || BOOST_MSVC >= 1300 -# define BOOST_TT_AUX_SIZE_T_BASE(C) public ::boost::integral_constant<std::size_t,C> -# define BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) /**/ -#else -# define BOOST_TT_AUX_SIZE_T_BASE(C) public ::boost::mpl::size_t<C> -# define BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) \ - typedef ::boost::mpl::size_t<C> base_; \ - using base_::value; \ - /**/ -#endif +// Obsolete. Remove. +#define BOOST_TT_AUX_SIZE_T_BASE(C) public ::boost::integral_constant<std::size_t,C> +#define BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) /**/ #define BOOST_TT_AUX_SIZE_T_TRAIT_DEF1(trait,T,C) \ template< typename T > struct trait \ - : BOOST_TT_AUX_SIZE_T_BASE(C) \ + : public ::boost::integral_constant<std::size_t,C> \ { \ public:\ - BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) \ BOOST_MPL_AUX_LAMBDA_SUPPORT(1,trait,(T)) \ }; \ \ @@ -44,17 +36,16 @@ BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,trait) \ #define BOOST_TT_AUX_SIZE_T_TRAIT_SPEC1(trait,spec,C) \ template<> struct trait<spec> \ - : BOOST_TT_AUX_SIZE_T_BASE(C) \ + : public ::boost::integral_constant<std::size_t,C> \ { \ public:\ - BOOST_TT_AUX_SIZE_T_TRAIT_VALUE_DECL(C) \ BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(1,trait,(spec)) \ }; \ /**/ #define BOOST_TT_AUX_SIZE_T_TRAIT_PARTIAL_SPEC1_1(param,trait,spec,C) \ template< param > struct trait<spec> \ - : BOOST_TT_AUX_SIZE_T_BASE(C) \ + : public ::boost::integral_constant<std::size_t,C> \ { \ }; \ /**/ |