Skip to content

J
json
Unverified Commit ea667db4 authored by Niels Lohmann's avatar Niels Lohmann
Browse files
Options

🔨 fixed compilation errors 

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
parent 89efe627
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
src/json.hpp
View file @ ea667db4
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment