The split of json_object into type-specific sub-structures is now functionally complete.

Remove all of the temporary defines, structures, old compat fuctions, extra fields, etc... that were needed during the conversion to a split set of json_object_* structures.
This commit is contained in:
Eric Haszlakiewicz
2020-06-07 03:30:39 +00:00
parent c4cc673071
commit 66d91fdf86
5 changed files with 89 additions and 433 deletions

View File

@@ -490,9 +490,8 @@ JSON_EXPORT void json_object_object_del(struct json_object *obj, const char *key
* @param obj the json_object instance
* @param iter the object iterator, use type json_object_iter
*/
// XAX temporary workaround during code conversion:
#define json_object_object_foreachC(obj, iter) \
for (iter.entry = json_object_get_object(PUBLIC(obj))->head; \
for (iter.entry = json_object_get_object(obj)->head; \
(iter.entry ? (iter.key = (char *)lh_entry_k(iter.entry), \
iter.val = (struct json_object *)lh_entry_v(iter.entry), iter.entry) \
: 0); \