From 7ed9432eed94beef4f35f16df2c0bd53dd2ce4bc Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 7 Dec 2016 06:18:30 -0800 Subject: Fix some C style casts to use casting macros. This is uncovered by compiling with g++ using -Wold-style-cast. * mpi/mpi.c (mp_get_intptr): Use convert macro. Also in one of the rules producing REGCHAR. * parser.l (num_esc): Likewise. * struct.c (static_slot_set, static_slot_ens_rec, get_equal_method): Use coerce macro for int to pointer conversion. * sysif.c (setgroups_wrap): Use convert macro. * termios.c (termios_unpack, termios_pack): Likewise. * txr.c (sysroot_init): Likewise. --- struct.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index 364050ba..bfa6acbd 100644 --- a/struct.c +++ b/struct.c @@ -924,7 +924,7 @@ val static_slot_set(val stype, val sym, val newval) if (symbolp(sym)) { loc ptr = lookup_static_slot(stype, st, sym); if (!nullocp(ptr)) { - if (st->eqmslot == (struct stslot *) -1) + if (st->eqmslot == coerce(struct stslot *, -1)) st->eqmslot = 0; return set(ptr, newval); } @@ -1014,7 +1014,7 @@ static val static_slot_ens_rec(val stype, val sym, val newval, no_error_p = default_bool_arg(no_error_p); - if (st->eqmslot == (struct stslot *) -1) + if (st->eqmslot == coerce(struct stslot *, -1)) st->eqmslot = 0; if (stsl != 0 && opt_compat && opt_compat <= 151) { @@ -1384,7 +1384,7 @@ static cnum struct_inst_hash(val obj, int *count) static val get_equal_method(val stype, struct struct_type *st) { - if (st->eqmslot == (struct stslot *) -1) { + if (st->eqmslot == coerce(struct stslot *, -1)) { return nil; } else if (st->eqmslot) { struct stslot *stsl = st->eqmslot; @@ -1395,7 +1395,7 @@ static val get_equal_method(val stype, struct struct_type *st) st->eqmslot = stsl; return stslot_place(stsl); } - st->eqmslot = (struct stslot *) -1; + st->eqmslot = coerce(struct stslot *, -1); return nil; } } -- cgit v1.2.3