boostorg/integer
1
0
Fork 1
mirror of https://github.com/boostorg/integer.git synced 2025-07-30 04:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Peter Dimov
2015-01-18 20:04:57 +02:00
parent 603f412c1b c5370a9705
commit 66ae9dc182
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/integer.hpp
View File

@ -111,11 +111,11 @@ namespace boost
// signed // signed
template< int Bits > // bits (including sign) required template< int Bits > // bits (including sign) required
struct int_t : public detail::exact_signed_base_helper<Bits> struct int_t : public boost::detail::exact_signed_base_helper<Bits>
{ {
BOOST_STATIC_ASSERT_MSG(Bits <= (int)(sizeof(boost::intmax_t) * CHAR_BIT), BOOST_STATIC_ASSERT_MSG(Bits <= (int)(sizeof(boost::intmax_t) * CHAR_BIT),
"No suitable signed integer type with the requested number of bits is available."); "No suitable signed integer type with the requested number of bits is available.");
typedef typename detail::int_least_helper typedef typename boost::detail::int_least_helper
< <
#ifdef BOOST_HAS_LONG_LONG #ifdef BOOST_HAS_LONG_LONG
(Bits <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) + (Bits <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
@ -132,7 +132,7 @@ namespace boost
// unsigned // unsigned
template< int Bits > // bits required template< int Bits > // bits required
struct uint_t : public detail::exact_unsigned_base_helper<Bits> struct uint_t : public boost::detail::exact_unsigned_base_helper<Bits>
{ {
BOOST_STATIC_ASSERT_MSG(Bits <= (int)(sizeof(boost::uintmax_t) * CHAR_BIT), BOOST_STATIC_ASSERT_MSG(Bits <= (int)(sizeof(boost::uintmax_t) * CHAR_BIT),
"No suitable unsigned integer type with the requested number of bits is available."); "No suitable unsigned integer type with the requested number of bits is available.");
@ -146,7 +146,7 @@ namespace boost
(Bits <= ::std::numeric_limits<unsigned char>::digits)); (Bits <= ::std::numeric_limits<unsigned char>::digits));
typedef typename detail::int_least_helper< ::boost::uint_t<Bits>::s>::least least; typedef typename detail::int_least_helper< ::boost::uint_t<Bits>::s>::least least;
#else #else
typedef typename detail::uint_least_helper typedef typename boost::detail::uint_least_helper
< <
#ifdef BOOST_HAS_LONG_LONG #ifdef BOOST_HAS_LONG_LONG
(Bits <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) + (Bits <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
@ -173,7 +173,7 @@ namespace boost
#endif #endif
struct int_max_value_t struct int_max_value_t
{ {
typedef typename 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_HAS_LONG_LONG)
(MaxValue <= ::boost::integer_traits<boost::long_long_type>::const_max) + (MaxValue <= ::boost::integer_traits<boost::long_long_type>::const_max) +
@ -195,7 +195,7 @@ namespace boost
#endif #endif
struct int_min_value_t struct int_min_value_t
{ {
typedef typename 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_HAS_LONG_LONG)
(MinValue >= ::boost::integer_traits<boost::long_long_type>::const_min) + (MinValue >= ::boost::integer_traits<boost::long_long_type>::const_min) +
@ -239,7 +239,7 @@ namespace boost
typedef typename detail::uint_least_helper< ::boost::uint_value_t<MaxValue>::which>::least least; typedef typename detail::uint_least_helper< ::boost::uint_value_t<MaxValue>::which>::least least;
#endif // BOOST_NO_INTEGRAL_INT64_T #endif // BOOST_NO_INTEGRAL_INT64_T
#else #else
typedef typename detail::uint_least_helper typedef typename boost::detail::uint_least_helper
< <
#if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG) #if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG)
(MaxValue <= ::boost::integer_traits<boost::ulong_long_type>::const_max) + (MaxValue <= ::boost::integer_traits<boost::ulong_long_type>::const_max) +