luo980/json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bf86054782 into 8215dbafbd

Browse Source
This commit is contained in:
權少 2025-02-22 06:10:29 +01:00 committed by GitHub
commit 9d1b1a6969
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nlohmann/detail/conversions/to_chars.hpp
View File

@ -250,7 +250,8 @@ boundaries compute_boundaries(FloatType value)
// Determine w- = m- such that e_(w-) = e_(w+). // Determine w- = m- such that e_(w-) = e_(w+).
const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e); const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
return {diyfp::normalize(v), w_minus, w_plus}; boundaries result {diyfp::normalize(v), w_minus, w_plus};
return result;
} }
// Given normalized diyfp w, Grisu needs to find a (normalized) cached // Given normalized diyfp w, Grisu needs to find a (normalized) cached

3
tests/CMakeLists.txt
View File

@ -58,6 +58,9 @@ target_compile_options(test_main PUBLIC
$<$<CXX_COMPILER_ID:MSVC>:/W4 /wd4566 /wd4996> $<$<CXX_COMPILER_ID:MSVC>:/W4 /wd4566 /wd4996>
# https://github.com/nlohmann/json/issues/1114 # https://github.com/nlohmann/json/issues/1114
$<$<CXX_COMPILER_ID:MSVC>:/bigobj> $<$<BOOL:${MINGW}>:-Wa,-mbig-obj> $<$<CXX_COMPILER_ID:MSVC>:/bigobj> $<$<BOOL:${MINGW}>:-Wa,-mbig-obj>
# MSVC: Set source and execution character sets to UTF-8
$<$<CXX_COMPILER_ID:MSVC>:
$<$<VERSION_GREATER_EQUAL:${MSVC_VERSION},1900>:/utf-8;>>
# https://github.com/nlohmann/json/pull/3229 # https://github.com/nlohmann/json/pull/3229
$<$<CXX_COMPILER_ID:Intel>:-diag-disable=2196> $<$<CXX_COMPILER_ID:Intel>:-diag-disable=2196>