From b949176a6a56b55aa5c9f2a8dd2cc8ab385ce75a Mon Sep 17 00:00:00 2001 From: yeggor Date: Mon, 30 Sep 2024 17:10:33 +0100 Subject: [PATCH] fix windows build --- efiXplorer/3rd/nlohmann_json/json.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/efiXplorer/3rd/nlohmann_json/json.hpp b/efiXplorer/3rd/nlohmann_json/json.hpp index 7ceca624..d47e1362 100644 --- a/efiXplorer/3rd/nlohmann_json/json.hpp +++ b/efiXplorer/3rd/nlohmann_json/json.hpp @@ -13952,7 +13952,11 @@ class json_pointer const char* p = s.c_str(); char* p_end = nullptr; errno = 0; // strtoull doesn't reset errno +#if defined(_MSC_VER) + const unsigned long long res = strtoull(p, &p_end, 10); // NOLINT(runtime/int) +#else const unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int) +#endif if (p == p_end // invalid input or empty string || errno == ERANGE // out of range || JSON_HEDLEY_UNLIKELY(static_cast(p_end - p) != s.size())) // incomplete read