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

🏁 fix MSVC 2015 compilation

Browse source
This commit is contained in:
Niels Lohmann 2020-06-07 12:51:33 +02:00
parent bf2e714e96
commit 907803189b
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/nlohmann/detail/input/lexer.hpp
View file

@ -1450,18 +1450,18 @@ scan_number_done:
// literals // literals
case 't': case 't':
{ {
char_type true_literal[] = "true"; std::array<char_type, 4> true_literal = {{'t', 'r', 'u', 'e'}};
return scan_literal(true_literal, 4, token_type::literal_true); return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
} }
case 'f': case 'f':
{ {
char_type false_literal[] = "false"; std::array<char_type, 5> false_literal = {{'f', 'a', 'l', 's', 'e'}};
return scan_literal(false_literal, 5, token_type::literal_false); return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
} }
case 'n': case 'n':
{ {
char_type null_literal[] = "null"; std::array<char_type, 4> null_literal = {{'n', 'u', 'l', 'l'}};
return scan_literal(null_literal, 4, token_type::literal_null); return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
} }
// string // string

12
single_include/nlohmann/json.hpp
View file

@ -9514,18 +9514,18 @@ scan_number_done:
// literals // literals
case 't': case 't':
{ {
char_type true_literal[] = "true"; std::array<char_type, 4> true_literal = {{'t', 'r', 'u', 'e'}};
return scan_literal(true_literal, 4, token_type::literal_true); return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
} }
case 'f': case 'f':
{ {
char_type false_literal[] = "false"; std::array<char_type, 5> false_literal = {{'f', 'a', 'l', 's', 'e'}};
return scan_literal(false_literal, 5, token_type::literal_false); return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
} }
case 'n': case 'n':
{ {
char_type null_literal[] = "null"; std::array<char_type, 4> null_literal = {{'n', 'u', 'l', 'l'}};
return scan_literal(null_literal, 4, token_type::literal_null); return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
} }
// string // string