feedc0de/boost_integer
1
0
Fork 0
forked from boostorg/integer
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Vicente J. Botet Escriba
2015-03-09 08:10:54 +01:00
parent 66ae9dc182 1ff7278d5f
commit 14020f6f6c
4 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/boost/integer.hpp
View File

@ -42,15 +42,15 @@ namespace boost
// fast integers from least integers // fast integers from least integers
// int_fast_t<> works correctly for unsigned too, in spite of the name. // int_fast_t<> works correctly for unsigned too, in spite of the name.
template< typename LeastInt > template< typename LeastInt >
struct int_fast_t struct int_fast_t
{ {
typedef LeastInt fast; typedef LeastInt fast;
typedef fast type; typedef fast type;
}; // imps may specialize }; // imps may specialize
namespace detail{ namespace detail{
// convert category to type // convert category to type
template< int Category > struct int_least_helper {}; // default is empty template< int Category > struct int_least_helper {}; // default is empty
template< int Category > struct uint_least_helper {}; // default is empty template< int Category > struct uint_least_helper {}; // default is empty
@ -91,7 +91,8 @@ namespace boost
template <> struct exact_signed_base_helper<sizeof(int)* CHAR_BIT> { typedef int exact; }; template <> struct exact_signed_base_helper<sizeof(int)* CHAR_BIT> { typedef int exact; };
template <> struct exact_unsigned_base_helper<sizeof(unsigned int)* CHAR_BIT> { typedef unsigned int exact; }; template <> struct exact_unsigned_base_helper<sizeof(unsigned int)* CHAR_BIT> { typedef unsigned int exact; };
#endif #endif
#if ULONG_MAX != UINT_MAX #if ULONG_MAX != UINT_MAX && ( !defined __TI_COMPILER_VERSION__ || \
( __TI_COMPILER_VERSION__ >= 7000000 && !defined __TI_40BIT_LONG__ ) )
template <> struct exact_signed_base_helper<sizeof(long)* CHAR_BIT> { typedef long exact; }; template <> struct exact_signed_base_helper<sizeof(long)* CHAR_BIT> { typedef long exact; };
template <> struct exact_unsigned_base_helper<sizeof(unsigned long)* CHAR_BIT> { typedef unsigned long exact; }; template <> struct exact_unsigned_base_helper<sizeof(unsigned long)* CHAR_BIT> { typedef unsigned long exact; };
#endif #endif
@ -138,7 +139,7 @@ namespace boost
"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.");
#if (defined(__BORLANDC__) || defined(__CODEGEAR__)) && defined(BOOST_NO_INTEGRAL_INT64_T) #if (defined(__BORLANDC__) || defined(__CODEGEAR__)) && defined(BOOST_NO_INTEGRAL_INT64_T)
// It's really not clear why this workaround should be needed... shrug I guess! JM // It's really not clear why this workaround should be needed... shrug I guess! JM
BOOST_STATIC_CONSTANT(int, s = BOOST_STATIC_CONSTANT(int, s =
6 + 6 +
(Bits <= ::std::numeric_limits<unsigned long>::digits) + (Bits <= ::std::numeric_limits<unsigned long>::digits) +
(Bits <= ::std::numeric_limits<unsigned int>::digits) + (Bits <= ::std::numeric_limits<unsigned int>::digits) +
@ -147,7 +148,7 @@ namespace boost
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 boost::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)) +
#else #else
@ -166,16 +167,16 @@ 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
#endif #endif
struct int_max_value_t struct int_max_value_t
{ {
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,16 +189,16 @@ 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
#endif #endif
struct int_min_value_t struct int_min_value_t
{ {
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 +
@ -216,12 +217,12 @@ namespace boost
#else #else
template< unsigned long MaxValue > // minimum value to require support template< unsigned long MaxValue > // minimum value to require support
#endif #endif
struct uint_value_t struct uint_value_t
{ {
#if (defined(__BORLANDC__) || defined(__CODEGEAR__)) #if (defined(__BORLANDC__) || defined(__CODEGEAR__))
// It's really not clear why this workaround should be needed... shrug I guess! JM // It's really not clear why this workaround should be needed... shrug I guess! JM
#if defined(BOOST_NO_INTEGRAL_INT64_T) #if defined(BOOST_NO_INTEGRAL_INT64_T)
BOOST_STATIC_CONSTANT(unsigned, which = BOOST_STATIC_CONSTANT(unsigned, which =
1 + 1 +
(MaxValue <= ::boost::integer_traits<unsigned long>::const_max) + (MaxValue <= ::boost::integer_traits<unsigned long>::const_max) +
(MaxValue <= ::boost::integer_traits<unsigned int>::const_max) + (MaxValue <= ::boost::integer_traits<unsigned int>::const_max) +
@ -229,7 +230,7 @@ namespace boost
(MaxValue <= ::boost::integer_traits<unsigned char>::const_max)); (MaxValue <= ::boost::integer_traits<unsigned char>::const_max));
typedef typename detail::int_least_helper< ::boost::uint_value_t<MaxValue>::which>::least least; typedef typename detail::int_least_helper< ::boost::uint_value_t<MaxValue>::which>::least least;
#else // BOOST_NO_INTEGRAL_INT64_T #else // BOOST_NO_INTEGRAL_INT64_T
BOOST_STATIC_CONSTANT(unsigned, which = BOOST_STATIC_CONSTANT(unsigned, which =
1 + 1 +
(MaxValue <= ::boost::integer_traits<boost::ulong_long_type>::const_max) + (MaxValue <= ::boost::integer_traits<boost::ulong_long_type>::const_max) +
(MaxValue <= ::boost::integer_traits<unsigned long>::const_max) + (MaxValue <= ::boost::integer_traits<unsigned long>::const_max) +
@ -240,7 +241,7 @@ namespace boost
#endif // BOOST_NO_INTEGRAL_INT64_T #endif // BOOST_NO_INTEGRAL_INT64_T
#else #else
typedef typename boost::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) +
#else #else

1
test/Jamfile.v2
View File

@ -25,5 +25,6 @@ test-suite integer
[ compile-fail fail_uint_exact.cpp ] [ compile-fail fail_uint_exact.cpp ]
[ compile-fail fail_uint_fast.cpp ] [ compile-fail fail_uint_fast.cpp ]
[ compile-fail fail_uint_least.cpp ] [ compile-fail fail_uint_least.cpp ]
[ compile-fail fail_uint_65.cpp ]
[ run common_factor_test.cpp ] [ run common_factor_test.cpp ]
; ;

13
test/fail_uint_65.cpp Normal file
View File

@ -0,0 +1,13 @@
// Copyright John Maddock 2012.
// Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <boost/integer.hpp>
#include <iostream>
int main()
{
std::cout << std::numeric_limits<boost::uint_t<65>::least>::digits;
return 0;
}

1
test/integer_test.cpp
View File

@ -18,6 +18,7 @@
#include <boost/detail/lightweight_test.hpp> // for main, BOOST_TEST #include <boost/detail/lightweight_test.hpp> // for main, BOOST_TEST
#include <boost/integer.hpp> // for boost::int_t, boost::uint_t #include <boost/integer.hpp> // for boost::int_t, boost::uint_t
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
#include <boost/mpl/bool.hpp> // for mpl::true_ and false_
#include <climits> // for ULONG_MAX, LONG_MAX, LONG_MIN #include <climits> // for ULONG_MAX, LONG_MAX, LONG_MIN
#include <iostream> // for std::cout (std::endl indirectly) #include <iostream> // for std::cout (std::endl indirectly)