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

Merge branch 'develop' into feature/sax2

Browse source
This commit is contained in:
Niels Lohmann 2018-03-13 23:58:17 +01:00
commit abac6a0e84
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
8 changed files with 238 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/nlohmann/detail/input/parser.hpp
View file

@ -33,6 +33,7 @@ class parser
using number_integer_t = typename BasicJsonType::number_integer_t;
using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
using number_float_t = typename BasicJsonType::number_float_t;
using string_t = typename BasicJsonType::string_t;
using lexer_t = lexer<BasicJsonType>;
using token_type = typename lexer_t::token_type;
@ -205,7 +206,7 @@ class parser
}
// parse values
std::string key;
string_t key;
BasicJsonType value;
while (true)
{