j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

♻️ replace further alternative operators

Browse source
This commit is contained in:
Niels Lohmann 2020-07-11 13:39:14 +02:00
parent d7a2956b24
commit 609a0046c4
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -260,7 +260,7 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
} }
else else
{ {
if (JSON_HEDLEY_UNLIKELY(not input.empty())) if (JSON_HEDLEY_UNLIKELY(!input.empty()))
{ {
const auto wc2 = static_cast<unsigned int>(input.get_character()); const auto wc2 = static_cast<unsigned int>(input.get_character());
const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
@ -404,7 +404,7 @@ using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const
template < typename CharT, template < typename CharT,
typename std::enable_if < typename std::enable_if <
std::is_pointer<CharT>::value&& std::is_pointer<CharT>::value&&
not std::is_array<CharT>::value&& !std::is_array<CharT>::value&&
std::is_integral<typename std::remove_pointer<CharT>::type>::value&& std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
sizeof(typename std::remove_pointer<CharT>::type) == 1, sizeof(typename std::remove_pointer<CharT>::type) == 1,
int >::type = 0 > int >::type = 0 >

2
include/nlohmann/detail/input/lexer.hpp
View file

@ -1513,7 +1513,7 @@ scan_number_done:
// ignore comments // ignore comments
if (ignore_comments && current == '/') if (ignore_comments && current == '/')
{ {
if (not scan_comment()) if (!scan_comment())
{ {
return token_type::parse_error; return token_type::parse_error;
} }

6
single_include/nlohmann/json.hpp
View file

@ -4688,7 +4688,7 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
} }
else else
{ {
if (JSON_HEDLEY_UNLIKELY(not input.empty())) if (JSON_HEDLEY_UNLIKELY(!input.empty()))
{ {
const auto wc2 = static_cast<unsigned int>(input.get_character()); const auto wc2 = static_cast<unsigned int>(input.get_character());
const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
@ -4832,7 +4832,7 @@ using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const
template < typename CharT, template < typename CharT,
typename std::enable_if < typename std::enable_if <
std::is_pointer<CharT>::value&& std::is_pointer<CharT>::value&&
not std::is_array<CharT>::value&& !std::is_array<CharT>::value&&
std::is_integral<typename std::remove_pointer<CharT>::type>::value&& std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
sizeof(typename std::remove_pointer<CharT>::type) == 1, sizeof(typename std::remove_pointer<CharT>::type) == 1,
int >::type = 0 > int >::type = 0 >
@ -9584,7 +9584,7 @@ scan_number_done:
// ignore comments // ignore comments
if (ignore_comments && current == '/') if (ignore_comments && current == '/')
{ {
if (not scan_comment()) if (!scan_comment())
{ {
return token_type::parse_error; return token_type::parse_error;
} }