From 609a0046c4c76be2eb344d5923f8c548799182a3 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 11 Jul 2020 13:39:14 +0200 Subject: [PATCH] :recycle: replace further alternative operators --- include/nlohmann/detail/input/input_adapters.hpp | 4 ++-- include/nlohmann/detail/input/lexer.hpp | 2 +- single_include/nlohmann/json.hpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp index 13a8bfe8f..f6ce00d45 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 (JSON_HEDLEY_UNLIKELY(not input.empty())) + if (JSON_HEDLEY_UNLIKELY(!input.empty())) { const auto wc2 = static_cast(input.get_character()); const auto charcode = 0x10000u + (((static_cast(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); @@ -404,7 +404,7 @@ using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval::value&& - not std::is_array::value&& + !std::is_array::value&& std::is_integral::type>::value&& sizeof(typename std::remove_pointer::type) == 1, int >::type = 0 > diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index e21c72950..049cbe858 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -1513,7 +1513,7 @@ scan_number_done: // ignore comments if (ignore_comments && current == '/') { - if (not scan_comment()) + if (!scan_comment()) { return token_type::parse_error; } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index a387655f6..e06526285 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -4688,7 +4688,7 @@ struct wide_string_input_helper } else { - if (JSON_HEDLEY_UNLIKELY(not input.empty())) + if (JSON_HEDLEY_UNLIKELY(!input.empty())) { const auto wc2 = static_cast(input.get_character()); const auto charcode = 0x10000u + (((static_cast(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); @@ -4832,7 +4832,7 @@ using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval::value&& - not std::is_array::value&& + !std::is_array::value&& std::is_integral::type>::value&& sizeof(typename std::remove_pointer::type) == 1, int >::type = 0 > @@ -9584,7 +9584,7 @@ scan_number_done: // ignore comments if (ignore_comments && current == '/') { - if (not scan_comment()) + if (!scan_comment()) { return token_type::parse_error; }