amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-09 17:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use (std::min)(len, reserve_cap) instead of a ternary in start_array()

Browse Source 
Addresses review feedback from @gregmarr on PR #5476.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-08 19:48:47 +02:00
parent 1c9475d68f
commit d753f53e68
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/input/json_sax.hpp
+3 -2
View File
@@ -8,6 +8,7 @@
#pragma once
#include <algorithm> // min
#include <cstddef>
#include <string> // string
#include <type_traits> // enable_if_t
@@ -308,7 +309,7 @@ class json_sax_dom_parser
// by max_size(), unlike e.g. std::vector) cannot trigger an oversized
// allocation for a small or truncated input
constexpr std::size_t reserve_cap = 16384;
ref_stack.back()->m_data.m_value.array->reserve(len < reserve_cap ? len : reserve_cap);
ref_stack.back()->m_data.m_value.array->reserve((std::min)(len, reserve_cap));
}
return true;
@@ -679,7 +680,7 @@ class json_sax_dom_callback_parser
// by max_size(), unlike e.g. std::vector) cannot trigger an oversized
// allocation for a small or truncated input
constexpr std::size_t reserve_cap = 16384;
ref_stack.back()->m_data.m_value.array->reserve(len < reserve_cap ? len : reserve_cap);
ref_stack.back()->m_data.m_value.array->reserve((std::min)(len, reserve_cap));
}
}