boostorg/integer
1
0
Fork 1
mirror of https://github.com/boostorg/integer.git synced 2025-07-23 09:17:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for long long throughout.

Browse Source 
Fixes #653.

[SVN r57873]
This commit is contained in:
John Maddock
2009-11-23 18:51:33 +00:00
parent e07b49c955
commit ddb6a13f29
3 changed files with 73 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
include/boost/integer.hpp
View File

@ -19,6 +19,7 @@
#include <boost/integer_traits.hpp> // for boost::integer_traits #include <boost/integer_traits.hpp> // for boost::integer_traits
#include <boost/limits.hpp> // for std::numeric_limits #include <boost/limits.hpp> // for std::numeric_limits
#include <boost/cstdint.hpp> // for boost::int64_t and BOOST_NO_INTEGRAL_INT64_T
namespace boost namespace boost
{ {
@ -36,14 +37,20 @@ namespace boost
// specializatons: 1=long, 2=int, 3=short, 4=signed char, // specializatons: 1=long, 2=int, 3=short, 4=signed char,
// 6=unsigned long, 7=unsigned int, 8=unsigned short, 9=unsigned char // 6=unsigned long, 7=unsigned int, 8=unsigned short, 9=unsigned char
// no specializations for 0 and 5: requests for a type > long are in error // no specializations for 0 and 5: requests for a type > long are in error
template<> struct int_least_helper<1> { typedef long least; }; #ifdef BOOST_HAS_LONG_LONG
template<> struct int_least_helper<2> { typedef int least; }; template<> struct int_least_helper<1> { typedef boost::long_long_type least; };
template<> struct int_least_helper<3> { typedef short least; }; #endif
template<> struct int_least_helper<4> { typedef signed char least; }; template<> struct int_least_helper<2> { typedef long least; };
template<> struct int_least_helper<6> { typedef unsigned long least; }; template<> struct int_least_helper<3> { typedef int least; };
template<> struct int_least_helper<7> { typedef unsigned int least; }; template<> struct int_least_helper<4> { typedef short least; };
template<> struct int_least_helper<8> { typedef unsigned short least; }; template<> struct int_least_helper<5> { typedef signed char least; };
template<> struct int_least_helper<9> { typedef unsigned char least; }; #ifdef BOOST_HAS_LONG_LONG
template<> struct int_least_helper<6> { typedef boost::ulong_long_type least; };
#endif
template<> struct int_least_helper<7> { typedef unsigned long least; };
template<> struct int_least_helper<8> { typedef unsigned int least; };
template<> struct int_least_helper<9> { typedef unsigned short least; };
template<> struct int_least_helper<10> { typedef unsigned char least; };
// integer templates specifying number of bits ---------------------------// // integer templates specifying number of bits ---------------------------//
@ -53,6 +60,11 @@ namespace boost
{ {
typedef typename int_least_helper typedef typename int_least_helper
< <
#ifdef BOOST_HAS_LONG_LONG
(Bits-1 <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
#else
1 +
#endif
(Bits-1 <= std::numeric_limits<long>::digits) + (Bits-1 <= std::numeric_limits<long>::digits) +
(Bits-1 <= std::numeric_limits<int>::digits) + (Bits-1 <= std::numeric_limits<int>::digits) +
(Bits-1 <= std::numeric_limits<short>::digits) + (Bits-1 <= std::numeric_limits<short>::digits) +
@ -68,6 +80,11 @@ namespace boost
typedef typename int_least_helper typedef typename int_least_helper
< <
5 + 5 +
#ifdef BOOST_HAS_LONG_LONG
(Bits-1 <= (int)(sizeof(boost::long_long_type) * CHAR_BIT)) +
#else
1 +
#endif
(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) +
(Bits <= std::numeric_limits<unsigned short>::digits) + (Bits <= std::numeric_limits<unsigned short>::digits) +
@ -80,11 +97,20 @@ 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)
template< boost::long_long_type MaxValue > // maximum value to require support
#else
template< long MaxValue > // maximum value to require support template< long MaxValue > // maximum value to require support
#endif
struct int_max_value_t struct int_max_value_t
{ {
typedef typename int_least_helper typedef typename int_least_helper
< <
#ifdef BOOST_HAS_LONG_LONG
(MaxValue <= integer_traits<boost::long_long_type>::const_max) +
#else
1 +
#endif
(MaxValue <= integer_traits<long>::const_max) + (MaxValue <= integer_traits<long>::const_max) +
(MaxValue <= integer_traits<int>::const_max) + (MaxValue <= integer_traits<int>::const_max) +
(MaxValue <= integer_traits<short>::const_max) + (MaxValue <= integer_traits<short>::const_max) +
@ -93,11 +119,20 @@ namespace boost
typedef typename int_fast_t<least>::fast fast; typedef typename int_fast_t<least>::fast fast;
}; };
#if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG)
template< boost::long_long_type MinValue > // minimum value to require support
#else
template< long MinValue > // minimum value to require support template< long MinValue > // minimum value to require support
#endif
struct int_min_value_t struct int_min_value_t
{ {
typedef typename int_least_helper typedef typename int_least_helper
< <
#ifdef BOOST_HAS_LONG_LONG
(MinValue >= integer_traits<boost::long_long_type>::const_min) +
#else
1 +
#endif
(MinValue >= integer_traits<long>::const_min) + (MinValue >= integer_traits<long>::const_min) +
(MinValue >= integer_traits<int>::const_min) + (MinValue >= integer_traits<int>::const_min) +
(MinValue >= integer_traits<short>::const_min) + (MinValue >= integer_traits<short>::const_min) +
@ -107,16 +142,25 @@ namespace boost
}; };
// unsigned // unsigned
template< unsigned long Value > // maximum value to require support #if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG)
template< boost::ulong_long_type MaxValue > // minimum value to require support
#else
template< long MaxValue > // minimum value to require support
#endif
struct uint_value_t struct uint_value_t
{ {
typedef typename int_least_helper typedef typename int_least_helper
< <
5 + 5 +
(Value <= integer_traits<unsigned long>::const_max) + #ifdef BOOST_HAS_LONG_LONG
(Value <= integer_traits<unsigned int>::const_max) + (MaxValue <= integer_traits<boost::ulong_long_type>::const_max) +
(Value <= integer_traits<unsigned short>::const_max) + #else
(Value <= integer_traits<unsigned char>::const_max) 1 +
#endif
(MaxValue <= integer_traits<unsigned long>::const_max) +
(MaxValue <= integer_traits<unsigned int>::const_max) +
(MaxValue <= integer_traits<unsigned short>::const_max) +
(MaxValue <= integer_traits<unsigned char>::const_max)
>::least least; >::least least;
typedef typename int_fast_t<least>::fast fast; typedef typename int_fast_t<least>::fast fast;
}; };

18
include/boost/integer_fwd.hpp
View File

@ -85,13 +85,25 @@ template< int Bits >
template< int Bits > template< int Bits >
struct uint_t; struct uint_t;
template< long MaxValue > #if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG)
template< boost::long_long_type MaxValue > // maximum value to require support
#else
template< long MaxValue > // maximum value to require support
#endif
struct int_max_value_t; struct int_max_value_t;
template< long MinValue > #if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG)
template< boost::long_long_type MinValue > // minimum value to require support
#else
template< long MinValue > // minimum value to require support
#endif
struct int_min_value_t; struct int_min_value_t;
template< unsigned long Value > #if !defined(BOOST_NO_INTEGRAL_INT64_T) && defined(BOOST_HAS_LONG_LONG)
template< boost::ulong_long_type MaxValue > // maximum value to require support
#else
template< long MaxValue > // maximum value to require support
#endif
struct uint_value_t; struct uint_value_t;

2
test/integer_test.cpp
View File

@ -134,7 +134,7 @@ namespace boost
// Test if a constant can fit within a certain type // Test if a constant can fit within a certain type
#define PRIVATE_FIT_TEST(Template, Number, Type, Value) BOOST_CHECK( Template < Number > :: Type ( Value ) == Value ) #define PRIVATE_FIT_TEST(Template, Number, Type, Value) BOOST_CHECK( Template < Number > :: Type ( Value ) == Value )
#if ULONG_MAX > 0xFFFFFFFFL #if (ULONG_MAX > 0xFFFFFFFFL) || !defined(BOOST_NO_INTEGRAL_INT64_T)
#define PRIVATE_FIT_TESTS(Template, Type, ValType, InitVal) do { ValType v = InitVal ; \ #define PRIVATE_FIT_TESTS(Template, Type, ValType, InitVal) do { ValType v = InitVal ; \
PRIVATE_FIT_TEST(Template, 64, Type, v); v >>= 1; \ PRIVATE_FIT_TEST(Template, 64, Type, v); v >>= 1; \
PRIVATE_FIT_TEST(Template, 63, Type, v); v >>= 1; PRIVATE_FIT_TEST(Template, 62, Type, v); v >>= 1; \ PRIVATE_FIT_TEST(Template, 63, Type, v); v >>= 1; PRIVATE_FIT_TEST(Template, 62, Type, v); v >>= 1; \