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

Fix warning

Browse source
This commit is contained in:
Antonio Borondo 2018-10-03 11:13:35 +01:00
parent 9f18e17063
commit 0231059290
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,14 +126,7 @@ class wide_string_input_adapter : public input_adapter_protocol
// check if buffer needs to be filled // check if buffer needs to be filled
if (utf8_bytes_index == utf8_bytes_filled) if (utf8_bytes_index == utf8_bytes_filled)
{ {
if (sizeof(typename WideStringType::value_type) == 2) fill_buffer(sizeof(typename WideStringType::value_type));
{
fill_buffer_utf16();
}
else
{
fill_buffer_utf32();
}
assert(utf8_bytes_filled > 0); assert(utf8_bytes_filled > 0);
assert(utf8_bytes_index == 0); assert(utf8_bytes_index == 0);
@ -146,6 +139,18 @@ class wide_string_input_adapter : public input_adapter_protocol
} }
private: private:
void fill_buffer(size_t size)
{
if (2 == size)
{
fill_buffer_utf16();
}
else
{
fill_buffer_utf32();
}
}
void fill_buffer_utf16() void fill_buffer_utf16()
{ {
utf8_bytes_index = 0; utf8_bytes_index = 0;