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

🔨 small improvements

Browse source
This commit is contained in:
Niels Lohmann 2018-10-27 18:31:03 +02:00
parent 037e93f5c0
commit 4e765596f7
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
6 changed files with 339 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/nlohmann/detail/input/binary_reader.hpp
View file

@ -68,6 +68,10 @@ class binary_reader
switch (format)
{
case input_format_t::bson:
result = parse_bson_internal();
break;
case input_format_t::cbor:
result = parse_cbor_internal();
break;
@ -80,10 +84,6 @@ class binary_reader
result = parse_ubjson_internal();
break;
case input_format_t::bson:
result = parse_bson_internal();
break;
// LCOV_EXCL_START
default:
assert(false);
@ -135,8 +135,8 @@ class binary_reader
*/
bool parse_bson_internal()
{
std::int32_t documentSize;
get_number<std::int32_t, true>(input_format_t::bson, documentSize);
std::int32_t document_size;
get_number<std::int32_t, true>(input_format_t::bson, document_size);
if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
{
@ -315,8 +315,8 @@ class binary_reader
*/
bool parse_bson_array()
{
std::int32_t documentSize;
get_number<std::int32_t, true>(input_format_t::bson, documentSize);
std::int32_t document_size;
get_number<std::int32_t, true>(input_format_t::bson, document_size);
if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
{

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

@ -92,7 +92,7 @@ class input_stream_adapter : public input_adapter_protocol
class input_buffer_adapter : public input_adapter_protocol
{
public:
input_buffer_adapter(const char* b, const std::size_t l)
input_buffer_adapter(const char* b, const std::size_t l) noexcept
: cursor(b), limit(b + l)
{}
@ -240,7 +240,9 @@ template<typename WideStringType>
class wide_string_input_adapter : public input_adapter_protocol
{
public:
explicit wide_string_input_adapter(const WideStringType& w) : str(w) {}
explicit wide_string_input_adapter(const WideStringType& w) noexcept
: str(w)
{}
std::char_traits<char>::int_type get_character() noexcept override
{