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

Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers.

Browse Source
This commit is contained in:
Edward Diener
2020-03-29 08:30:32 -04:00
parent bee5818e18
commit 52c02d1237
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/integer.hpp
View File

@ -137,7 +137,7 @@ namespace boost
{ {
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.");
#if (defined(__BORLANDC__) || defined(__CODEGEAR__)) && defined(BOOST_NO_INTEGRAL_INT64_T) #if (defined(BOOST_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 +
@ -219,7 +219,7 @@ namespace boost
#endif #endif
struct uint_value_t struct uint_value_t
{ {
#if (defined(__BORLANDC__) || defined(__CODEGEAR__)) #if (defined(BOOST_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 =

2
include/boost/integer/common_factor_ct.hpp
View File

@ -30,7 +30,7 @@ namespace detail
BOOST_STATIC_CONSTANT( static_gcd_type, new_value1 = Value2 ); BOOST_STATIC_CONSTANT( static_gcd_type, new_value1 = Value2 );
BOOST_STATIC_CONSTANT( static_gcd_type, new_value2 = Value1 % Value2 ); BOOST_STATIC_CONSTANT( static_gcd_type, new_value2 = Value1 % Value2 );
#ifndef __BORLANDC__ #ifndef BOOST_BORLANDC
#define BOOST_DETAIL_GCD_HELPER_VAL(Value) static_cast<static_gcd_type>(Value) #define BOOST_DETAIL_GCD_HELPER_VAL(Value) static_cast<static_gcd_type>(Value)
#else #else
typedef static_gcd_helper_t self_type; typedef static_gcd_helper_t self_type;

4
include/boost/integer/integer_log2.hpp
View File

@ -16,7 +16,7 @@
#define BOOST_INTEGER_INTEGER_LOG2_HPP #define BOOST_INTEGER_INTEGER_LOG2_HPP
#include <assert.h> #include <assert.h>
#ifdef __BORLANDC__ #if defined(__BORLANDC__) && !defined(__clang__)
#include <climits> #include <climits>
#endif #endif
#include <boost/limits.hpp> #include <boost/limits.hpp>
@ -75,7 +75,7 @@ namespace boost {
template <typename T> template <typename T>
struct width { struct width {
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
BOOST_STATIC_CONSTANT(int, value = sizeof(T) * CHAR_BIT); BOOST_STATIC_CONSTANT(int, value = sizeof(T) * CHAR_BIT);
#else #else
BOOST_STATIC_CONSTANT(int, value = (std::numeric_limits<T>::digits)); BOOST_STATIC_CONSTANT(int, value = (std::numeric_limits<T>::digits));

2
include/boost/integer_traits.hpp
View File

@ -103,7 +103,7 @@ class integer_traits<wchar_t>
// library: they are wrong! // library: they are wrong!
#if defined(WCHAR_MIN) && defined(WCHAR_MAX) && !defined(__APPLE__) #if defined(WCHAR_MIN) && defined(WCHAR_MAX) && !defined(__APPLE__)
public detail::integer_traits_base<wchar_t, WCHAR_MIN, WCHAR_MAX> public detail::integer_traits_base<wchar_t, WCHAR_MIN, WCHAR_MAX>
#elif defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__)) #elif defined(BOOST_BORLANDC) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__))
// No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned: // No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned:
public detail::integer_traits_base<wchar_t, 0, 0xffff> public detail::integer_traits_base<wchar_t, 0, 0xffff>
#elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400))\ #elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400))\

2
test/integer_test.cpp
View File

@ -27,7 +27,7 @@
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning(disable:4127) // conditional expression is constant #pragma warning(disable:4127) // conditional expression is constant
#endif #endif
#if defined( __BORLANDC__ ) #if defined( BOOST_BORLANDC )
# pragma option -w-8008 -w-8066 // condition is always true # pragma option -w-8008 -w-8066 // condition is always true
#endif #endif