diff options
| author | Björn Gustavsson <[email protected]> | 2011-05-13 14:22:29 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-05-13 14:22:29 +0200 |
| commit | 926795501b71ebf9ca4b22927021fa551549f9b0 (patch) | |
| tree | c0ae4a4a483a858c0d26dbd763752ef7b038f71d /erts/emulator/beam/beam_emu.c | |
| parent | e008b6385d038196f7d2c9db98339e311e48fa88 (diff) | |
| parent | 54b677e80cdd1da685c69d349ca83e68dce5b991 (diff) | |
| download | otp-926795501b71ebf9ca4b22927021fa551549f9b0.tar.gz otp-926795501b71ebf9ca4b22927021fa551549f9b0.tar.bz2 otp-926795501b71ebf9ca4b22927021fa551549f9b0.zip | |
Merge branch 'bjorn/fix-warnings/OTP-9250' into dev
* bjorn/fix-warnings/OTP-9250:
Eliminate alias warning in gcc 4.5.2
erl_trace: Eliminate alias warning
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 32ea8588d2..d5d113200a 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1911,13 +1911,15 @@ void process_main(void) * Note that for the halfword emulator, the two first elements * of the array are used. */ - *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3; + BeamInstr** pi = (BeamInstr**) c_p->def_arg_reg; + *pi = I+3; set_timer(c_p, unsigned_val(timeout_value)); } else if (timeout_value == am_infinity) { c_p->flags |= F_TIMO; #if !defined(ARCH_64) || HALFWORD_HEAP } else if (term_to_Uint(timeout_value, &time_val)) { - *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3; + BeamInstr** pi = (BeamInstr**) c_p->def_arg_reg; + *pi = I+3; set_timer(c_p, time_val); #endif } else { /* Wrong time */ @@ -1974,7 +1976,8 @@ void process_main(void) * we must test the F_INSLPQUEUE flag as well as the F_TIMO flag. */ if ((c_p->flags & (F_INSLPQUEUE | F_TIMO)) == 0) { - *((BeamInstr **) (UWord) c_p->def_arg_reg) = I+3; + BeamInstr** p = (BeamInstr **) c_p->def_arg_reg; + *p = I+3; set_timer(c_p, Arg(1)); } goto wait2; |