From b9c9f7a9d3732d9d5f5954147de56ee09a140648 Mon Sep 17 00:00:00 2001 From: Qianqian Fang Date: Tue, 17 May 2022 17:55:26 -0400 Subject: [PATCH] fix msvc error --- include/nlohmann/detail/input/binary_reader.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 507a5fe60..89ae352f1 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -2113,7 +2113,7 @@ class binary_reader { return false; } - if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1) || std::count(dim.begin(), dim.end(), 0)) // return normal array size if 1D row vector or total length is 0 + if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1) || std::count(dim.begin(), dim.end(), 0) > 0) // return normal array size if 1D row vector or total length is 0 { result = dim.at(dim.size() - 1); return true; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 0f2c5e62d..2b628cbcf 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -10587,7 +10587,7 @@ class binary_reader { return false; } - if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1) || std::count(dim.begin(), dim.end(), 0)) // return normal array size if 1D row vector or total length is 0 + if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1) || std::count(dim.begin(), dim.end(), 0) > 0) // return normal array size if 1D row vector or total length is 0 { result = dim.at(dim.size() - 1); return true;