Changeset 1456:8627338e36ab in freeDiameter for extensions

Timestamp:

Feb 28, 2020, 8:21:52 AM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

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.

File:

• extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc (modified) (3 diffs)

extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc

@@ -105 +105 @@
 
         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;
 
@@ -113 +113 @@
 
         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;
 
@@ -414 +414 @@
         /* 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);