AuroraMiddleware/nlohmannjson
1
0
Fork 0
mirror of https://github.com/nlohmann/json synced 2024-11-29 15:11:04 +00:00
Code Issues Releases Wiki Activity

amalgamate

Browse Source
This commit is contained in:
Francois Chabot 2020-05-28 10:11:19 -04:00
parent 7ceb06baac
commit 897061c434
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
single_include/nlohmann/json.hpp
View File

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

2
test/src/unit-user_defined_input.cpp
View File

@ -98,7 +98,7 @@ TEST_CASE("Custom iterator")
{
return *ptr;
}
bool operator!=(const MyIterator& rhs) const
{
return ptr != rhs.ptr;