Skip to content

Commit 05d9f24

Browse files
authored
Merge pull request #1390 from boostorg/1389
Allow fallthrough of Android to 128-bit float
2 parents df8bb08 + 74406e5 commit 05d9f24

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

.drone/drone.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ echo '==================================> BEFORE_SCRIPT'
5151
echo '==================================> SCRIPT'
5252

5353
echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD $OPTIONS ;" > ~/user-config.jam
54-
(cd libs/config/test && ../../../b2 config_info_travis_install toolset=$TOOLSET && ./config_info_travis)
55-
(cd libs/math/test && ../../../b2 toolset=$TOOLSET $TEST_SUITE define=$DEFINE)
54+
(cd libs/config/test && ../../../b2 print_config_info print_math_info toolset=$TOOLSET)
55+
(cd libs/math/test && ../../../b2 -j3 toolset=$TOOLSET $TEST_SUITE)
5656

5757
echo '==================================> AFTER_SUCCESS'
5858

include/boost/math/special_functions/detail/fp_traits.hpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,7 @@ template<> struct fp_traits_non_native<double, double_precision>
270270

271271
// long double (64 bits) -------------------------------------------------------
272272

273-
#if defined(BOOST_NO_INT64_T) || defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION)\
274-
|| defined(BOOST_BORLANDC) || defined(__CODEGEAR__) || (defined(__APPLE__) && defined(__aarch64__)) || defined(_MSC_VER)\
275-
|| (defined(__GNUC__) && defined(__aarch64__) && defined(_WIN32))\
276-
|| (defined(__GNUC__) && (defined(__arm__) || defined(__thumb__)))\
277-
|| defined(__SYCL_DEVICE_ONLY__) || (LDBL_MANT_DIG == 53)
278-
279-
static_assert(LDBL_MANT_DIG == 53, "Oops, assumption that long double is a 64-bit quantity is incorrect!!");
273+
#if LDBL_MANT_DIG == 53 || defined(__SYCL_DEVICE_ONLY__)
280274

281275
template<> struct fp_traits_non_native<long double, double_precision>
282276
{
@@ -305,14 +299,10 @@ template<> struct fp_traits_non_native<long double, double_precision>
305299

306300
// long double (>64 bits), x86 and x64 -----------------------------------------
307301

308-
#elif defined(__i386) || defined(__i386__) || defined(_M_IX86) \
309-
|| defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) \
310-
|| defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)
302+
#elif LDBL_MANT_DIG == 64
311303

312304
// Intel extended double precision format (80 bits)
313305

314-
static_assert(LDBL_MANT_DIG == 64, "Oops, assumption that long double is an 80-bit quantity is incorrect!!");
315-
316306
template<>
317307
struct fp_traits_non_native<long double, extended_double_precision>
318308
{
@@ -440,8 +430,6 @@ struct fp_traits_non_native<long double, extended_double_precision>
440430

441431
// IEEE extended double precision format with 15 exponent bits (128 bits)
442432

443-
static_assert(LDBL_MANT_DIG == 113, "Oops, assumption that long double is a 128-bit quantity is incorrect!!");
444-
445433
template<>
446434
struct fp_traits_non_native<long double, extended_double_precision>
447435
{

0 commit comments

Comments
 (0)