X-Git-Url: https://git.donarmstrong.com/?p=rsem.git;a=blobdiff_plain;f=boost%2Ftype_traits%2Fmake_unsigned.hpp;h=7e2fcdc453df267686b1fdf05c2100676cee29a3;hp=54f9f665b33b14c61ba527e2917f7c57f226f565;hb=2d71eb92104693ca9baa5a2e1c23eeca776d8fd3;hpb=da57529b92adbb7ae74a89861cb39fb35ac7c62d diff --git a/boost/type_traits/make_unsigned.hpp b/boost/type_traits/make_unsigned.hpp index 54f9f66..7e2fcdc 100644 --- a/boost/type_traits/make_unsigned.hpp +++ b/boost/type_traits/make_unsigned.hpp @@ -72,7 +72,15 @@ struct make_unsigned_imp is_same, unsigned long, #if defined(BOOST_HAS_LONG_LONG) +#ifdef BOOST_HAS_INT128 + typename mpl::if_c< + sizeof(t_no_cv) == sizeof(boost::ulong_long_type), + boost::ulong_long_type, + boost::uint128_type + >::type +#else boost::ulong_long_type +#endif #elif defined(BOOST_HAS_MS_INT64) unsigned __int64 #else @@ -96,7 +104,15 @@ struct make_unsigned_imp sizeof(t_no_cv) == sizeof(unsigned long), unsigned long, #if defined(BOOST_HAS_LONG_LONG) +#ifdef BOOST_HAS_INT128 + typename mpl::if_c< + sizeof(t_no_cv) == sizeof(boost::ulong_long_type), + boost::ulong_long_type, + boost::uint128_type + >::type +#else boost::ulong_long_type +#endif #elif defined(BOOST_HAS_MS_INT64) unsigned __int64 #else