From dcf6175978fa45e6e617b3879c7a98bc37dce80d Mon Sep 17 00:00:00 2001 From: Francois Chabot Date: Thu, 28 May 2020 09:29:38 -0400 Subject: [PATCH] use the correct convention for boolean operators --- include/nlohmann/detail/input/input_adapters.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp index 08954a2f..3d90ac3e 100644 --- a/include/nlohmann/detail/input/input_adapters.hpp +++ b/include/nlohmann/detail/input/input_adapters.hpp @@ -260,7 +260,7 @@ struct wide_string_input_helper } else { - if (!input.empty()) + if (JSON_HEDLEY_UNLIKELY(not input.empty())) { const auto wc2 = static_cast(input.get_character()); const auto charcode = 0x10000u + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); @@ -399,7 +399,7 @@ using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval::value and - !std::is_array::value and + not std::is_array::value and std::is_integral::type>::value and sizeof(typename std::remove_pointer::type) == 1, int >::type = 0 >