From 9c9bc0dca85ebada80acc48ad38828468f5dc29b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 26 Apr 2019 10:18:55 -0400 Subject: [PATCH] bt2: Sync native_bt_field_class.i with field-class-const.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 2d97b62eea05 ("lib: have dedicated, unique unsigned and signed enum FC mapping objects") Changed some declarations in field-class-const.h without doing the corresponding changes in native_bt_field_class.i. I am now seeing this build error: bt2/native_bt_wrap.c: In function ‘_wrap_field_class_unsigned_enumeration_borrow_mapping_by_index_const’: bt2/native_bt_wrap.c:11087:3: error: unknown type name ‘bt_field_class_unsigned_enumeration_mapping_ranges’; did you mean ‘bt_field_class_unsigned_enumeration_mapping’? bt_field_class_unsigned_enumeration_mapping_ranges **arg4 = (bt_field_class_unsigned_enumeration_mapping_ranges **) 0 ; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bt_field_class_unsigned_enumeration_mapping Change-Id: I897749a6a7fe5bd1c3c16b1ea9625820e77f112b Signed-off-by: Simon Marchi Reviewed-on: https://review.gerrithub.io/c/eepp/babeltrace/+/452225 Reviewed-by: Philippe Proulx Tested-by: Philippe Proulx --- .../python/bt2/bt2/native_bt_field_class.i | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/bindings/python/bt2/bt2/native_bt_field_class.i b/bindings/python/bt2/bt2/native_bt_field_class.i index a7ae445f..b6173c06 100644 --- a/bindings/python/bt2/bt2/native_bt_field_class.i +++ b/bindings/python/bt2/bt2/native_bt_field_class.i @@ -129,32 +129,36 @@ extern bt_bool bt_field_class_real_is_single_precision( extern uint64_t bt_field_class_enumeration_get_mapping_count( const bt_field_class *field_class); -extern void bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const( - const bt_field_class *field_class, uint64_t index, - const char **OUT, - const bt_field_class_unsigned_enumeration_mapping_ranges **ENUM_RANGE_MAPPING); +extern const bt_field_class_unsigned_enumeration_mapping * +bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const( + const bt_field_class *field_class, uint64_t index); + +extern const bt_field_class_signed_enumeration_mapping * +bt_field_class_signed_enumeration_borrow_mapping_by_index_const( + const bt_field_class *field_class, uint64_t index); + +const bt_field_class_enumeration_mapping * +bt_field_class_unsigned_enumeration_mapping_as_mapping_const( + const bt_field_class_unsigned_enumeration_mapping *mapping); -extern void bt_field_class_signed_enumeration_borrow_mapping_by_index_const( - const bt_field_class *field_class, uint64_t index, - const char **OUT, - const bt_field_class_signed_enumeration_mapping_ranges **ENUM_RANGE_MAPPING); +const bt_field_class_enumeration_mapping * +bt_field_class_signed_enumeration_mapping_as_mapping_const( + const bt_field_class_signed_enumeration_mapping *mapping); -extern uint64_t -bt_field_class_unsigned_enumeration_mapping_ranges_get_range_count( - const bt_field_class_unsigned_enumeration_mapping_ranges *ranges); +extern const char *bt_field_class_enumeration_mapping_get_label( + const bt_field_class_enumeration_mapping *mapping); -extern uint64_t -bt_field_class_signed_enumeration_mapping_ranges_get_range_count( - const bt_field_class_signed_enumeration_mapping_ranges *ranges); +extern uint64_t bt_field_class_enumeration_mapping_get_range_count( + const bt_field_class_enumeration_mapping *mapping); extern void -bt_field_class_unsigned_enumeration_mapping_ranges_get_range_by_index( - const bt_field_class_unsigned_enumeration_mapping_ranges *ranges, +bt_field_class_unsigned_enumeration_mapping_get_range_by_index( + const bt_field_class_unsigned_enumeration_mapping *mapping, uint64_t index, uint64_t *OUT, uint64_t *OUT); extern void -bt_field_class_signed_enumeration_mapping_ranges_get_range_by_index( - const bt_field_class_signed_enumeration_mapping_ranges *ranges, +bt_field_class_signed_enumeration_mapping_get_range_by_index( + const bt_field_class_signed_enumeration_mapping *mapping, uint64_t index, int64_t *OUT, int64_t *OUT); extern bt_field_class_status -- 2.34.1