Mercurial > hg > freeDiameter-proposed
changeset 1455:8627338e36ab
fix dbg_dict_dump_json build
Cast to jsoncpp *Int64 types as they may differ from *int64_t.
Don't rely upon C++11 support in compilers.
author | Luke Mewburn <luke@mewburn.net> |
---|---|
date | Fri, 28 Feb 2020 10:21:52 +1100 |
parents | 75b6ec7c70b3 |
children | da5e5b9c9623 |
files | extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc Fri Feb 28 10:08:37 2020 +1100 +++ b/extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc Fri Feb 28 10:21:52 2020 +1100 @@ -104,7 +104,7 @@ break; case AVP_TYPE_INTEGER64: - enumval["Code"] = Json::Value(data->enum_value.i64); + enumval["Code"] = Json::Value(static_cast<Json::Int64>(data->enum_value.i64)); break; case AVP_TYPE_UNSIGNED32: @@ -112,7 +112,7 @@ break; case AVP_TYPE_UNSIGNED64: - enumval["Code"] = Json::Value(data->enum_value.u64); + enumval["Code"] = Json::Value(static_cast<Json::UInt64>(data->enum_value.u64)); break; case AVP_TYPE_FLOAT32: @@ -413,7 +413,7 @@ /* remove enumerated types before dumping, they are in AVPs */ /* convert remaining ones to array */ Json::Value::Members members = main["Types"].getMemberNames(); - for (auto it = members.begin() ; it != members.end(); ++it) { + for (Json::Value::Members::const_iterator it = members.begin() ; it != members.end(); ++it) { if (strncmp("Enumerated", main["Types"][*it]["Name"].asCString(), strlen("Enumerated")) == 0) { main["Types"].removeMember(*it); } else {