diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:22:31 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:22:31 +0000 |
| commit | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (patch) | |
| tree | 5d78d22112806bca22edbc8e069f77503269b381 /asn1/ranap | |
| parent | b8481499646f07512ceddac567887072822dffdb (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48429
Diffstat (limited to 'asn1/ranap')
| -rw-r--r-- | asn1/ranap/ranap.cnf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 25f8e9096e..38b243c7c7 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -118,7 +118,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = { { "lowerBound", ASN1_PAR_INTEGER }, { "upperBound", ASN1_PAR_INTEGER }, - { NULL, 0 } + { NULL, (asn1_par_type)0 } }; asn1_stack_frame_check(actx, "ProtocolIE-ContainerList", ProtocolIE_ContainerList_pars); #.END @@ -134,7 +134,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") static const asn1_par_def_t ProtocolIE_ContainerPairList_pars[] = { { "lowerBound", ASN1_PAR_INTEGER }, { "upperBound", ASN1_PAR_INTEGER }, - { NULL, 0 } + { NULL, (asn1_par_type)0 } }; asn1_stack_frame_check(actx, "ProtocolIE-ContainerPairList", ProtocolIE_ContainerPairList_pars); #.END @@ -201,7 +201,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") && ! actx->pinfo->sccp_info->data.co.assoc->calling_party ) { guint len = tvb_length(imsi_tvb); - guint8* bytes = ep_tvb_memdup(imsi_tvb,0,len); + guint8* bytes = (guint8 *)ep_tvb_memdup(imsi_tvb,0,len); actx->pinfo->sccp_info->data.co.assoc->calling_party = se_strdup_printf("IMSI: %%s", bytes_to_str(bytes, len) ); |