Made the GCD specializations for '(unsigned) long long' and '(unsigned) __int64' mutually exclusive, following the lead of <boost/cstdint.hpp>.

[SVN r35999]
This commit is contained in:
Daryle Walker
2006-11-10 23:15:49 +00:00
committed by Peter Dimov
parent 1f5f827a5e
commit 80b59192ae
2 changed files with 6 additions and 11 deletions

View File

@ -296,9 +296,7 @@ namespace detail
#ifdef BOOST_HAS_LONG_LONG #ifdef BOOST_HAS_LONG_LONG
BOOST_PRIVATE_GCD_UF( unsigned long long ); BOOST_PRIVATE_GCD_UF( unsigned long long );
#endif #elif defined(BOOST_HAS_MS_INT64)
#ifdef BOOST_HAS_MS_INT64
BOOST_PRIVATE_GCD_UF( unsigned __int64 ); BOOST_PRIVATE_GCD_UF( unsigned __int64 );
#endif #endif
@ -320,9 +318,7 @@ namespace detail
#ifdef BOOST_HAS_LONG_LONG #ifdef BOOST_HAS_LONG_LONG
BOOST_PRIVATE_GCD_SF( long long, unsigned long long ); BOOST_PRIVATE_GCD_SF( long long, unsigned long long );
#endif #elif defined(BOOST_HAS_MS_INT64)
#ifdef BOOST_HAS_MS_INT64
BOOST_PRIVATE_GCD_SF( __int64, unsigned __int64 ); BOOST_PRIVATE_GCD_SF( __int64, unsigned __int64 );
#endif #endif

View File

@ -8,6 +8,7 @@
// See http://www.boost.org for most recent version including documentation. // See http://www.boost.org for most recent version including documentation.
// Revision History // Revision History
// 10 Nov 2006 Make long long and __int64 mutually exclusive (Daryle Walker)
// 04 Nov 2006 Use more built-in numeric types, binary-GCD (Daryle Walker) // 04 Nov 2006 Use more built-in numeric types, binary-GCD (Daryle Walker)
// 03 Nov 2006 Use custom numeric types (Daryle Walker) // 03 Nov 2006 Use custom numeric types (Daryle Walker)
// 02 Nov 2006 Change to Boost.Test's unit test system (Daryle Walker) // 02 Nov 2006 Change to Boost.Test's unit test system (Daryle Walker)
@ -15,7 +16,7 @@
#define BOOST_TEST_MAIN "Boost.Math GCD & LCM unit tests" #define BOOST_TEST_MAIN "Boost.Math GCD & LCM unit tests"
#include <boost/config.hpp> // for BOOST_MSVC #include <boost/config.hpp> // for BOOST_MSVC, etc.
#include <boost/math/common_factor.hpp> // for boost::math::gcd, etc. #include <boost/math/common_factor.hpp> // for boost::math::gcd, etc.
#include <boost/mpl/list.hpp> // for boost::mpl::list #include <boost/mpl/list.hpp> // for boost::mpl::list
#include <boost/operators.hpp> #include <boost/operators.hpp>
@ -108,8 +109,7 @@ typedef my_wrapped_integer<unsigned, 1> MyUnsigned2;
typedef ::boost::mpl::list<signed char, short, int, long, typedef ::boost::mpl::list<signed char, short, int, long,
#ifdef BOOST_HAS_LONG_LONG #ifdef BOOST_HAS_LONG_LONG
long long, long long,
#endif #elif defined(BOOST_HAS_MS_INT64)
#ifdef BOOST_HAS_MS_INT64
__int64, __int64,
#endif #endif
MyInt1> signed_test_types; MyInt1> signed_test_types;
@ -117,8 +117,7 @@ typedef ::boost::mpl::list<unsigned char, unsigned short, unsigned,
unsigned long, unsigned long,
#ifdef BOOST_HAS_LONG_LONG #ifdef BOOST_HAS_LONG_LONG
unsigned long long, unsigned long long,
#endif #elif defined(BOOST_HAS_MS_INT64)
#ifdef BOOST_HAS_MS_INT64
unsigned __int64, unsigned __int64,
#endif #endif
MyUnsigned1, MyUnsigned2> unsigned_test_types; MyUnsigned1, MyUnsigned2> unsigned_test_types;