amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-03-04 08:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔨 fixed compilation errors

Browse Source 
TIL about C++:

executing m[key()]=val(); for a std::map executes

First key() then val() with Clang

First val() then key() with GCC

#wat
This commit is contained in:
Niels Lohmann
2017-04-03 21:53:23 +02:00
parent 89efe627fe
commit ea667db446
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/json.hpp
View File

@@ -10722,7 +10722,8 @@ class basic_json
for (size_t i = 0; i < len; ++i)
{
get();
result[get_cbor_string()] = parse_cbor();
auto key = get_cbor_string();
result[key] = parse_cbor();
}
return result;
}
@@ -10734,7 +10735,8 @@ class basic_json
for (size_t i = 0; i < len; ++i)
{
get();
result[get_cbor_string()] = parse_cbor();
auto key = get_cbor_string();
result[key] = parse_cbor();
}
return result;
}
@@ -10746,7 +10748,8 @@ class basic_json
for (size_t i = 0; i < len; ++i)
{
get();
result[get_cbor_string()] = parse_cbor();
auto key = get_cbor_string();
result[key] = parse_cbor();
}
return result;
}
@@ -10758,7 +10761,8 @@ class basic_json
for (size_t i = 0; i < len; ++i)
{
get();
result[get_cbor_string()] = parse_cbor();
auto key = get_cbor_string();
result[key] = parse_cbor();
}
return result;
}
@@ -10770,7 +10774,8 @@ class basic_json
for (size_t i = 0; i < len; ++i)
{
get();
result[get_cbor_string()] = parse_cbor();
auto key = get_cbor_string();
result[key] = parse_cbor();
}
return result;
}
@@ -10780,7 +10785,8 @@ class basic_json
basic_json result = value_t::object;
while (get() != 0xff)
{
result[get_cbor_string()] = parse_cbor();
auto key = get_cbor_string();
result[key] = parse_cbor();
}
return result;
}