manage with #6694 Boost.Integer part.

This commit is contained in:
Vicente J. Botet Escriba
2015-01-25 17:03:09 +01:00
parent 83feb20e51
commit 7ffb75bb43

View File

@ -166,7 +166,7 @@ namespace boost
// integer templates specifying extreme value ----------------------------// // integer templates specifying extreme value ----------------------------//
// signed // signed
#if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG) #if !defined(BOOST_NO_INTEGRAL_INT64_T) && !defined(BOOST_NO_INT64_T) && defined(BOOST_HAS_LONG_LONG)
template< boost::long_long_type MaxValue > // maximum value to require support template< boost::long_long_type MaxValue > // maximum value to require support
#else #else
template< long MaxValue > // maximum value to require support template< long MaxValue > // maximum value to require support
@ -175,7 +175,7 @@ namespace boost
{ {
typedef typename boost::detail::int_least_helper typedef typename boost::detail::int_least_helper
< <
#if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG) #if !defined(BOOST_NO_INTEGRAL_INT64_T) && !defined(BOOST_NO_INT64_T) && defined(BOOST_HAS_LONG_LONG)
(MaxValue <= ::boost::integer_traits<boost::long_long_type>::const_max) + (MaxValue <= ::boost::integer_traits<boost::long_long_type>::const_max) +
#else #else
1 + 1 +
@ -188,7 +188,7 @@ namespace boost
typedef typename int_fast_t<least>::type fast; typedef typename int_fast_t<least>::type fast;
}; };
#if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG) #if !defined(BOOST_NO_INTEGRAL_INT64_T) && !defined(BOOST_NO_INT64_T) && defined(BOOST_HAS_LONG_LONG)
template< boost::long_long_type MinValue > // minimum value to require support template< boost::long_long_type MinValue > // minimum value to require support
#else #else
template< long MinValue > // minimum value to require support template< long MinValue > // minimum value to require support
@ -197,7 +197,7 @@ namespace boost
{ {
typedef typename boost::detail::int_least_helper typedef typename boost::detail::int_least_helper
< <
#if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG) #if !defined(BOOST_NO_INTEGRAL_INT64_T) && !defined(BOOST_NO_INT64_T) && defined(BOOST_HAS_LONG_LONG)
(MinValue >= ::boost::integer_traits<boost::long_long_type>::const_min) + (MinValue >= ::boost::integer_traits<boost::long_long_type>::const_min) +
#else #else
1 + 1 +