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

Change implementation to use templates

Browse source
This commit is contained in:
Antonio Borondo 2018-10-03 11:44:02 +01:00
parent ad3c216bb5
commit 8d1585f065
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,7 +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)
{ {
fill_buffer(sizeof(typename WideStringType::value_type)); fill_buffer<sizeof(typename WideStringType::value_type)>();
assert(utf8_bytes_filled > 0); assert(utf8_bytes_filled > 0);
assert(utf8_bytes_index == 0); assert(utf8_bytes_index == 0);
@ -139,16 +139,16 @@ class wide_string_input_adapter : public input_adapter_protocol
} }
private: private:
void fill_buffer(size_t size) template<size_t T>
void fill_buffer()
{ {
if (2 == size) fill_buffer_utf32();
{ }
fill_buffer_utf16();
} template<>
else void fill_buffer<2>()
{ {
fill_buffer_utf32(); fill_buffer_utf16();
}
} }
void fill_buffer_utf16() void fill_buffer_utf16()

20
single_include/nlohmann/json.hpp
View file

@ -2004,7 +2004,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)
{ {
fill_buffer(sizeof(typename WideStringType::value_type)); fill_buffer<sizeof(typename WideStringType::value_type)>();
assert(utf8_bytes_filled > 0); assert(utf8_bytes_filled > 0);
assert(utf8_bytes_index == 0); assert(utf8_bytes_index == 0);
@ -2017,18 +2017,18 @@ class wide_string_input_adapter : public input_adapter_protocol
} }
private: private:
void fill_buffer(size_t size) template<size_t T>
void fill_buffer()
{ {
if (2 == size) fill_buffer_utf32();
{
fill_buffer_utf16();
}
else
{
fill_buffer_utf32();
}
} }
template<>
void fill_buffer<2>()
{
fill_buffer_utf16();
}
void fill_buffer_utf16() void fill_buffer_utf16()
{ {
utf8_bytes_index = 0; utf8_bytes_index = 0;