Commit 83d5cb38 authored by GitHub Actions's avatar GitHub Actions
Browse files

Upstream release v2.0.1

parent 69d0b358

README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ include(FetchContent) 


FetchContent_Declare(json

  GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohman_json

  GIT_TAG v2.0.0)

  GIT_TAG v2.0.1)



FetchContent_GetProperties(json)

if(NOT json_POPULATED)

include/nlohmann/json.hpp

+10 −6
Original line number Diff line number Diff line 
/*

    __ _____ _____ _____

 __|  |   __|     |   | |  JSON for Modern C++

|  |  |__   |  |  | | | |  version 2.0.0

|  |  |__   |  |  | | | |  version 2.0.1

|_____|_____|_____|_|___|  https://github.com/nlohmann/json



Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@@ -2097,6 +2097,8 @@ class basic_json 
    string_t dump(const int indent = -1) const

    {

        std::stringstream ss;

        // fix locale problems

        ss.imbue(std::locale(std::locale(), new DecimalSeparator));



        if (indent >= 0)

        {
@@ -5655,9 +5657,14 @@ class basic_json 


        // reset width to 0 for subsequent calls to this stream

        o.width(0);

        // fix locale problems

        auto old_locale = o.imbue(std::locale(std::locale(), new DecimalSeparator));



        // do the actual serialization

        j.dump(o, pretty_print, static_cast<unsigned int>(indentation));



        // reset locale

        o.imbue(old_locale);

        return o;

    }
@@ -6128,11 +6135,8 @@ class basic_json 
                    // string->double->string or string->long

                    // double->string; to be safe, we read this value from

                    // std::numeric_limits<number_float_t>::digits10

                    std::stringstream ss;

                    ss.imbue(std::locale(std::locale(), new DecimalSeparator));  // fix locale problems

                    ss << std::setprecision(std::numeric_limits<double>::digits10)

                    o << std::setprecision(std::numeric_limits<double>::digits10)

                      << m_value.number_float;

                    o << ss.str();

                }

                return;

            }