use Charconv library instead of embedded copy

boostorg · Mar 19, 2024 · 55f6d90 · 55f6d90
1 parent 2b9ad2a
commit 55f6d90
Show file tree

Hide file tree

Showing 27 changed files with 13 additions and 5,524 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ function(boost_json_setup_properties target)
             Boost::align
             Boost::assert
             Boost::config
+            Boost::charconv
             Boost::container
             Boost::container_hash
             Boost::core

diff --git a/build/Jamfile b/build/Jamfile
@@ -77,23 +77,26 @@ project boost/json
     : source-location ../src
     ;
 
+local dependencies = container charconv ;
+dependencies = <library>/boost//$(dependencies)/<warnings-as-errors>off ;
+
 alias json_deps
    : usage-requirements
-     <library>/boost//container/<warnings-as-errors>off
+     $(dependencies)
    ;
 
 alias json_sources
    : src.cpp
    : usage-requirements
-     <library>/boost//container/<warnings-as-errors>off
+     $(dependencies)
    ;
 
 explicit json_deps json_sources ;
 
 lib boost_json
    : json_sources
    : usage-requirements
-     <library>/boost//container/<warnings-as-errors>off
+     $(dependencies)
    ;
 
 boost-install boost_json ;
diff --git a/include/boost/json/basic_parser_impl.hpp b/include/boost/json/basic_parser_impl.hpp
@@ -15,7 +15,7 @@
 #include <boost/json/basic_parser.hpp>
 #include <boost/json/error.hpp>
 #include <boost/json/detail/buffer.hpp>
-#include <boost/json/detail/charconv/from_chars.hpp>
+#include <boost/charconv/from_chars.hpp>
 #include <boost/json/detail/sse2.hpp>
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/integral.hpp>
@@ -2769,11 +2769,11 @@ parse_number(const char* p,
             data = num_buf_.append( begin, size );
             full_size = num_buf_.size();
         }
-        auto const err = detail::charconv::from_chars(
+        auto const result = charconv::from_chars_erange(
             data, data + full_size, d );
-        BOOST_ASSERT( err.ec != std::errc::invalid_argument );
-        BOOST_ASSERT( err.ptr == data + full_size );
-        (void)err;
+        BOOST_ASSERT( result.ec != std::errc::invalid_argument );
+        BOOST_ASSERT( result.ptr == data + full_size );
+        (void)result;
     }
     else BOOST_IF_CONSTEXPR( no_parsing )
         d = 0;

diff --git a/include/boost/json/detail/charconv/chars_format.hpp b/include/boost/json/detail/charconv/chars_format.hpp
diff --git a/include/boost/json/detail/charconv/detail/compute_float64.hpp b/include/boost/json/detail/charconv/detail/compute_float64.hpp
diff --git a/include/boost/json/detail/charconv/detail/config.hpp b/include/boost/json/detail/charconv/detail/config.hpp