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

use the correct convention for boolean operators

Browse source
This commit is contained in:
Francois Chabot 2020-05-28 09:29:38 -04:00
parent bfcd32c099
commit dcf6175978
1 changed files with 2 additions and 2 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 (!input.empty()) if (JSON_HEDLEY_UNLIKELY(not 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 + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); const auto charcode = 0x10000u + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
@ -399,7 +399,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 and std::is_pointer<CharT>::value and
!std::is_array<CharT>::value and not std::is_array<CharT>::value and
std::is_integral<typename std::remove_pointer<CharT>::type>::value and std::is_integral<typename std::remove_pointer<CharT>::type>::value and
sizeof(typename std::remove_pointer<CharT>::type) == 1, sizeof(typename std::remove_pointer<CharT>::type) == 1,
int >::type = 0 > int >::type = 0 >