Fix

[  5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-umts_fp.c.o
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c: In function ‘umts_fp_init_protocol’:
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4526:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->iface_type        = uat_umts_fp_ep_and_ch_records[i].interface_type;
                 ^
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4527:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->division          = uat_umts_fp_ep_and_ch_records[i].division;
                 ^
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4533:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->rlc_mode          = uat_umts_fp_ep_and_ch_records[i].rlc_mode;
                 ^
cc1: all warnings being treated as errors

Change-Id: Ie783a261c40d26ffd105822d5f45bd0513aa1914
Reviewed-on: https://code.wireshark.org/review/693
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index 59792b65269aaa171e9aece81935d7e8d4133e64..a5bfe5b7f949d89e1c72d3cac3b4e2c9bc211450 100644 (file)
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -4523,14 +4523,14 @@ umts_fp_init_protocol(void)
                 /* set up conversation info for RACH FDD channels */
                 umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
                 /* Fill in the data */
-                umts_fp_conversation_info->iface_type        = uat_umts_fp_ep_and_ch_records[i].interface_type;
-                umts_fp_conversation_info->division          = uat_umts_fp_ep_and_ch_records[i].division;
+                umts_fp_conversation_info->iface_type        = (enum fp_interface_type)uat_umts_fp_ep_and_ch_records[i].interface_type;
+                umts_fp_conversation_info->division          = (enum division_type) uat_umts_fp_ep_and_ch_records[i].division;
                 umts_fp_conversation_info->channel           = uat_umts_fp_ep_and_ch_records[i].channel_type;
                 umts_fp_conversation_info->dl_frame_number   = 0;
                 umts_fp_conversation_info->ul_frame_number   = 1;
                 SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &src_addr);
                 umts_fp_conversation_info->crnc_port         = uat_umts_fp_ep_and_ch_records[i].src_port;
-                umts_fp_conversation_info->rlc_mode          = uat_umts_fp_ep_and_ch_records[i].rlc_mode;
+                umts_fp_conversation_info->rlc_mode          = (enum fp_rlc_mode) uat_umts_fp_ep_and_ch_records[i].rlc_mode;
                 /*Save unique UE-identifier */
                 umts_fp_conversation_info->com_context_id = 1;