Merge pull request #252 from anarthal/bugfix/249-quadmath-usage-requi…

…rement Made BOOST_CHARCONV_HAS_QUADMATH a usage requirement in the Jamfile
boostorg · Jan 3, 2025 · 3133adc · 3133adc
2 parents ffd3e71 + 0cd42b7
commit 3133adc
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,7 +46,6 @@ target_link_libraries(boost_charconv
 # Check to see if the user specified BOOST_CHARCONV_NO_QUADMATH even with quadmath support being available
 if(NOT BOOST_CHARCONV_QUADMATH_FOUND OR BOOST_CHARCONV_NO_QUADMATH)
   message(STATUS "Boost.Charconv: quadmath support OFF")
-  target_compile_definitions(boost_charconv PUBLIC BOOST_CHARCONV_NO_QUADMATH)
 else()
   message(STATUS "Boost.Charconv: quadmath support ON")
   target_compile_definitions(boost_charconv PUBLIC BOOST_CHARCONV_HAS_QUADMATH)

diff --git a/build/Jamfile b/build/Jamfile
@@ -32,4 +32,6 @@ lib boost_charconv
   # usage-requirements
   : <link>shared:<define>BOOST_CHARCONV_DYN_LINK=1
     <define>BOOST_CHARCONV_NO_LIB=1
+
+    [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <library>"quadmath" <define>BOOST_CHARCONV_HAS_QUADMATH ]
 ;
diff --git a/include/boost/charconv/detail/buffer_sizing.hpp b/include/boost/charconv/detail/buffer_sizing.hpp
@@ -26,7 +26,7 @@ inline int get_real_precision(int precision = -1) noexcept
 
     int real_precision;
     BOOST_IF_CONSTEXPR (!std::is_same<Real, long double>::value
-                        #ifdef BOOST_CHARCONV_HAS_FLOAT128
+                        #ifdef BOOST_CHARCONV_HAS_QUADMATH
                         && !std::is_same<Real, __float128>::value
                         #endif
                         )
@@ -35,7 +35,7 @@ inline int get_real_precision(int precision = -1) noexcept
     }
     else
     {
-        #ifdef BOOST_CHARCONV_HAS_FLOAT128
+        #ifdef BOOST_CHARCONV_HAS_QUADMATH
         BOOST_CHARCONV_IF_CONSTEXPR (std::is_same<Real, __float128>::value)
         {
             real_precision = 33;

diff --git a/include/boost/charconv/detail/issignaling.hpp b/include/boost/charconv/detail/issignaling.hpp
@@ -15,7 +15,7 @@ namespace boost { namespace charconv { namespace detail {
 template <typename T>
 inline bool issignaling BOOST_PREVENT_MACRO_SUBSTITUTION (T x) noexcept;
 
-#if BOOST_CHARCONV_LDBL_BITS == 128
+#if BOOST_CHARCONV_LDBL_BITS == 128 || defined(BOOST_CHARCONV_HAS_QUADMATH)
 
 struct words128
 {

diff --git a/include/boost/charconv/detail/ryu/ryu_generic_128.hpp b/include/boost/charconv/detail/ryu/ryu_generic_128.hpp
@@ -397,7 +397,7 @@ static inline int generic_to_chars_fixed(const struct floating_decimal_128 v, ch
         if (precision > 0)
         {
             result[current_len++] = '.';
-            memset(result+current_len, '0', precision);
+            memset(result+current_len, '0', static_cast<size_t>(precision));
             current_len += precision;
             precision = 0;
         }

diff --git a/include/boost/charconv/from_chars.hpp b/include/boost/charconv/from_chars.hpp
@@ -172,7 +172,7 @@ BOOST_CHARCONV_DECL from_chars_result from_chars_erange(boost::core::string_view
 BOOST_CHARCONV_DECL from_chars_result from_chars_erange(boost::core::string_view sv, long double& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 
-#ifdef BOOST_CHARCONV_HAS_FLOAT128
+#ifdef BOOST_CHARCONV_HAS_QUADMATH
 BOOST_CHARCONV_DECL from_chars_result from_chars_erange(boost::core::string_view sv, __float128& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 
@@ -186,7 +186,7 @@ BOOST_CHARCONV_DECL from_chars_result from_chars_erange(boost::core::string_view
 #ifdef BOOST_CHARCONV_HAS_FLOAT64
 BOOST_CHARCONV_DECL from_chars_result from_chars_erange(boost::core::string_view sv, std::float64_t& value, chars_format fmt = chars_format::general) noexcept;
 #endif
-#if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_FLOAT128)
+#if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_QUADMATH)
 BOOST_CHARCONV_DECL from_chars_result from_chars_erange(boost::core::string_view sv, std::float128_t& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 #ifdef BOOST_CHARCONV_HAS_BRAINFLOAT16
@@ -204,7 +204,7 @@ BOOST_CHARCONV_DECL from_chars_result from_chars(const char* first, const char*
 BOOST_CHARCONV_DECL from_chars_result from_chars(const char* first, const char* last, long double& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 
-#ifdef BOOST_CHARCONV_HAS_FLOAT128
+#ifdef BOOST_CHARCONV_HAS_QUADMATH
 BOOST_CHARCONV_DECL from_chars_result from_chars(const char* first, const char* last, __float128& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 #ifdef BOOST_CHARCONV_HAS_FLOAT16
@@ -216,7 +216,7 @@ BOOST_CHARCONV_DECL from_chars_result from_chars(const char* first, const char*
 #ifdef BOOST_CHARCONV_HAS_FLOAT64
 BOOST_CHARCONV_DECL from_chars_result from_chars(const char* first, const char* last, std::float64_t& value, chars_format fmt = chars_format::general) noexcept;
 #endif
-#if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_FLOAT128)
+#if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_QUADMATH)
 BOOST_CHARCONV_DECL from_chars_result from_chars(const char* first, const char* last, std::float128_t& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 #ifdef BOOST_CHARCONV_HAS_BRAINFLOAT16
@@ -230,7 +230,7 @@ BOOST_CHARCONV_DECL from_chars_result from_chars(boost::core::string_view sv, do
 BOOST_CHARCONV_DECL from_chars_result from_chars(boost::core::string_view sv, long double& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 
-#ifdef BOOST_CHARCONV_HAS_FLOAT128
+#ifdef BOOST_CHARCONV_HAS_QUADMATH
 BOOST_CHARCONV_DECL from_chars_result from_chars(boost::core::string_view sv, __float128& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 #ifdef BOOST_CHARCONV_HAS_FLOAT16
@@ -242,7 +242,7 @@ BOOST_CHARCONV_DECL from_chars_result from_chars(boost::core::string_view sv, st
 #ifdef BOOST_CHARCONV_HAS_FLOAT64
 BOOST_CHARCONV_DECL from_chars_result from_chars(boost::core::string_view sv, std::float64_t& value, chars_format fmt = chars_format::general) noexcept;
 #endif
-#if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_FLOAT128)
+#if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_QUADMATH)
 BOOST_CHARCONV_DECL from_chars_result from_chars(boost::core::string_view sv, std::float128_t& value, chars_format fmt = chars_format::general) noexcept;
 #endif
 #ifdef BOOST_CHARCONV_HAS_BRAINFLOAT16

diff --git a/src/float128_impl.hpp b/src/float128_impl.hpp
@@ -20,8 +20,6 @@
 
 #include <quadmath.h>
 
-#define BOOST_CHARCONV_HAS_FLOAT128
-
 namespace boost {
 namespace charconv {
 
@@ -92,7 +90,7 @@ inline __float128 to_float128(Unsigned_Integer w) noexcept
 template <>
 inline __float128 to_float128<uint128>(uint128 w) noexcept
 {
-    return ldexp(static_cast<__float128>(w.high), 64) + static_cast<__float128>(w.low);
+    return ldexpq(static_cast<__float128>(w.high), 64) + static_cast<__float128>(w.low);
 }
 
 template <typename Unsigned_Integer, typename ArrayPtr>
@@ -354,6 +352,6 @@ inline bool issignaling<__float128> BOOST_PREVENT_MACRO_SUBSTITUTION (__float128
 } //namespace charconv
 } //namespace boost
 
-#endif //BOOST_CHARCONV_HAS_FLOAT128
+#endif //BOOST_CHARCONV_HAS_QUADMATH
 
 #endif //BOOST_CHARCONV_FLOAT128_IMPL_HPP
diff --git a/src/to_chars_float_impl.hpp b/src/to_chars_float_impl.hpp
@@ -121,7 +121,7 @@ inline to_chars_result to_chars_nonfinite(char* first, char* last, Real value, i
 
 #endif // BOOST_CHARCONV_LDBL_BITS == 128
 
-#ifdef BOOST_CHARCONV_HAS_FLOAT128
+#ifdef BOOST_CHARCONV_HAS_QUADMATH
 
 // GCC-5 evaluates the following specialization for other types
 #if defined(__GNUC__) && __GNUC__ == 5
@@ -200,7 +200,7 @@ inline to_chars_result to_chars_nonfinite<__float128>(char* first, char* last, _
 # pragma GCC diagnostic pop
 #endif
 
-#endif // BOOST_CHARCONV_HAS_FLOAT128
+#endif // BOOST_CHARCONV_HAS_QUADMATH
 
 template <typename Unsigned_Integer, typename Real, typename std::enable_if<!std::is_same<Unsigned_Integer, uint128>::value, bool>::type = true>
 Unsigned_Integer convert_value(Real value) noexcept
@@ -273,7 +273,7 @@ to_chars_result to_chars_hex(char* first, char* last, Real value, int precision)
 
         typename std::conditional<std::is_same<Real, float>::value, ieee754_binary32,
             typename std::conditional<std::is_same<Real, double>::value, ieee754_binary64,
-                    #ifdef BOOST_CHARCONV_HAS_FLOAT128
+                    #ifdef BOOST_CHARCONV_HAS_QUADMATH
                     typename std::conditional<std::is_same<Real, __float128>::value, ieee754_binary128,
                     #endif
                         #if BOOST_CHARCONV_LDBL_BITS == 128
@@ -283,7 +283,7 @@ to_chars_result to_chars_hex(char* first, char* last, Real value, int precision)
                         #else
                         ieee754_binary64
                         #endif
-                    #ifdef BOOST_CHARCONV_HAS_FLOAT128
+                    #ifdef BOOST_CHARCONV_HAS_QUADMATH
                     >::type
                     #endif
             >::type>::type
@@ -843,7 +843,7 @@ to_chars_result to_chars_float_impl(char* first, char* last, long double value,
 
 #endif
 
-#ifdef BOOST_CHARCONV_HAS_FLOAT128
+#ifdef BOOST_CHARCONV_HAS_QUADMATH
 
 template <>
 to_chars_result to_chars_float_impl(char* first, char* last, __float128 value, chars_format fmt, int precision) noexcept

diff --git a/test/Jamfile b/test/Jamfile
@@ -56,13 +56,13 @@ run test_boost_json_values.cpp ;
 run to_chars_float_STL_comp.cpp : : : [ requires cxx17_hdr_charconv ] ;
 run from_chars_float2.cpp ;
 run-fail STL_benchmark.cpp : : : [ requires cxx17_hdr_charconv ] [ check-target-builds ../config//has_double_conversion "Google double-coversion support" : <library>"double-conversion" ] ;
-run test_float128.cpp : : : [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <library>"quadmath" ] ;
+run test_float128.cpp ;
 run P2497.cpp ;
 run github_issue_110.cpp ;
 run github_issue_122.cpp ;
 run from_chars_string_view.cpp ;
 run github_issue_152.cpp ;
-run github_issue_152_float128.cpp : : : [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <library>"quadmath" ] ;
+run github_issue_152_float128.cpp ;
 run github_issue_154.cpp ;
 #run github_issue_156.cpp ;
 run github_issue_158.cpp ;

diff --git a/test/github_issue_110.cpp b/test/github_issue_110.cpp
@@ -47,7 +47,7 @@ int main()
     test<long double>();
     #endif
 
-    #ifdef BOOST_CHARCONV_HAS_FLOAT128
+    #ifdef BOOST_CHARCONV_HAS_QUADMATH
     test<__float128>();
     #endif
 
@@ -60,7 +60,7 @@ int main()
     #ifdef BOOST_CHARCONV_HAS_FLOAT64
     test<std::float64_t>();
     #endif
-    #if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_FLOAT128)
+    #if defined(BOOST_CHARCONV_HAS_STDFLOAT128) && defined(BOOST_CHARCONV_HAS_QUADMATH)
     test<std::float128_t>();
     #endif
     #ifdef BOOST_CHARCONV_HAS_BRAINFLOAT16

diff --git a/test/github_issue_152_float128.cpp b/test/github_issue_152_float128.cpp
@@ -7,6 +7,8 @@
 
 #ifdef BOOST_CHARCONV_HAS_QUADMATH
 
+#include <quadmath.h>
+
 std::ostream& operator<<( std::ostream& os, __float128 v )
 {
     char buffer[ 256 ] {};

diff --git a/test/test_128bit_emulation.cpp b/test/test_128bit_emulation.cpp
@@ -199,7 +199,7 @@ void test_bitwise_operators()
 
 void test_memcpy()
 {
-    #if defined(BOOST_CHARCONV_HAS_FLOAT128) && defined(BOOST_CHARCONV_HAS_INT128)
+    #if defined(BOOST_CHARCONV_HAS_QUADMATH) && defined(BOOST_CHARCONV_HAS_INT128)
     __float128 fval = 1e4000Q;
     boost::uint128_type ref;
     trivial_uint128 cpyval;

diff --git a/test/test_float128.cpp b/test/test_float128.cpp
@@ -7,6 +7,7 @@
 #if defined(BOOST_CHARCONV_HAS_QUADMATH) && defined(BOOST_HAS_INT128)
 
 #include <ostream>
+#include <quadmath.h>
 
 #ifdef BOOST_CHARCONV_HAS_STDFLOAT128
 #include <charconv>
@@ -85,13 +86,13 @@ std::ostream& operator<<( std::ostream& os, boost::int128_type v )
 #include <boost/charconv.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/core/detail/splitmix64.hpp>
-#include <boost/charconv/detail/generate_nan.hpp>
 #include <boost/charconv/detail/issignaling.hpp>
 #include <limits>
 #include <iostream>
 #include <iomanip>
 #include <string>
 #include <random>
+#include "../src/float128_impl.hpp"
 
 constexpr int N = 1024;
 static boost::detail::splitmix64 rng;