aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-03-30 17:47:28 -0700
committerGuy Harris <guy@alum.mit.edu>2016-03-31 00:48:51 +0000
commit3467a1f693b0d98292c341ebea8776807c195539 (patch)
tree14b0997813e9917daf8b1887cde27ef17d2d739b
parent8ba351b04b109c09956c7a69b5d91d3c87ffb180 (diff)
Squelch a "not allowed in C++" warning.
Change-Id: I2accdb7fe02072853a5ec9cae84403f3224dfada Reviewed-on: https://code.wireshark.org/review/14718 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/packet-iso8583.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-iso8583.c b/epan/dissectors/packet-iso8583.c
index c1d69eecae..679ad9d3f2 100644
--- a/epan/dissectors/packet-iso8583.c
+++ b/epan/dissectors/packet-iso8583.c
@@ -556,7 +556,7 @@ static gchar* bin2hex(const guint8 *bin, enum bin2hex_enum type, guint32 len)
gchar* buff;
/* "size" characters, plus terminating NUL */
- ret = wmem_alloc(wmem_packet_scope(), size + 1);
+ ret = (gchar *)wmem_alloc(wmem_packet_scope(), size + 1);
buff = ret;
if(type == TYPE_BCD)
{