amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-10 16:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'json-view/08-view-builder' into json-view/11-view-access

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-10 11:30:00 +02:00
2 parents 8d3272e93b 2f81bec10f
commit 25b25ece96
3 files changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/bit_ops.hpp
+2 -2
View File
@@ -30,7 +30,7 @@ inline int count_leading_zeros(std::uint64_t x) noexcept
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
return __builtin_clzll(x); return __builtin_clzll(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
unsigned long index = 0; unsigned long index = 0; // NOLINT(runtime/int): the type _BitScan*64 takes
_BitScanReverse64(&index, x); _BitScanReverse64(&index, x);
return 63 - static_cast<int>(index); return 63 - static_cast<int>(index);
#else #else
@@ -53,7 +53,7 @@ inline int count_trailing_zeros(std::uint64_t x) noexcept
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
return __builtin_ctzll(x); return __builtin_ctzll(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
unsigned long index = 0; unsigned long index = 0; // NOLINT(runtime/int): the type _BitScan*64 takes
_BitScanForward64(&index, x); _BitScanForward64(&index, x);
return static_cast<int>(index); return static_cast<int>(index);
#else #else
single_include/nlohmann/json.hpp
+2 -2
View File
@@ -8884,7 +8884,7 @@ inline int count_leading_zeros(std::uint64_t x) noexcept
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
return __builtin_clzll(x); return __builtin_clzll(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
unsigned long index = 0; unsigned long index = 0; // NOLINT(runtime/int): the type _BitScan*64 takes
_BitScanReverse64(&index, x); _BitScanReverse64(&index, x);
return 63 - static_cast<int>(index); return 63 - static_cast<int>(index);
#else #else
@@ -8907,7 +8907,7 @@ inline int count_trailing_zeros(std::uint64_t x) noexcept
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
return __builtin_ctzll(x); return __builtin_ctzll(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
unsigned long index = 0; unsigned long index = 0; // NOLINT(runtime/int): the type _BitScan*64 takes
_BitScanForward64(&index, x); _BitScanForward64(&index, x);
return static_cast<int>(index); return static_cast<int>(index);
#else #else
tests/src/unit-to_chars.cpp
+4
View File
@@ -837,6 +837,9 @@ TEST_CASE("choice of the conversion")
SECTION("long double with the format of a double: Zmij") SECTION("long double with the format of a double: Zmij")
{ {
// (on platforms where long double is wider, Grisu2 does not apply either: the snprintf fallback does) // (on platforms where long double is wider, Grisu2 does not apply either: the snprintf fallback does)
// (constant on a given platform)
DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
DOCTEST_MSVC_SUPPRESS_WARNING(4127)
if (std::numeric_limits<long double>::digits == 53 && std::numeric_limits<long double>::is_iec559) if (std::numeric_limits<long double>::digits == 53 && std::numeric_limits<long double>::is_iec559)
{ {
using long_double_json = nlohmann::json::with_float_t<long double>; using long_double_json = nlohmann::json::with_float_t<long double>;
@@ -850,5 +853,6 @@ TEST_CASE("choice of the conversion")
} }
CHECK(long_double_json(5.3165205877497296e+16L).dump() == "5.31652058774973e+16"); CHECK(long_double_json(5.3165205877497296e+16L).dump() == "5.31652058774973e+16");
} }
DOCTEST_MSVC_SUPPRESS_WARNING_POP
} }
} }