diff options
| author | Patrik Nyblom <[email protected]> | 2011-11-18 20:47:31 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-11-18 20:47:31 +0100 |
| commit | 49052a3d7422e0e776a8df83fa3d8280686cab0f (patch) | |
| tree | 2d098ea2b49235f2cff79e70d91c88ec9f1cf03c /erts/emulator/beam/big.c | |
| parent | 7d9ef0fdde8119e1be0a47e3e45c9cdb85f926d8 (diff) | |
| parent | 08d4822dd22465da4a452484780b285a93192fce (diff) | |
| download | otp-49052a3d7422e0e776a8df83fa3d8280686cab0f.tar.gz otp-49052a3d7422e0e776a8df83fa3d8280686cab0f.tar.bz2 otp-49052a3d7422e0e776a8df83fa3d8280686cab0f.zip | |
Merge branch 'pan/binary_match_scope/OTP-9701'
* pan/binary_match_scope/OTP-9701:
Remove remaining gcc 4.6 assigned-but-not-used warnings from erts
Remove GCC 4.6 set-but-not-used warning from erl_bif_binary
Make binary:match with scope return correct values
Diffstat (limited to 'erts/emulator/beam/big.c')
| -rw-r--r-- | erts/emulator/beam/big.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c index b90ea6b478..46db9ca99c 100644 --- a/erts/emulator/beam/big.c +++ b/erts/emulator/beam/big.c @@ -310,12 +310,12 @@ #define DREM(a1,a0,b,r) do { \ ErtsDigit __a1 = (a1); \ ErtsDigit __b = (b); \ - ErtsDigit __q0; \ + ERTS_DECLARE_DUMMY(ErtsDigit __q0); \ DDIVREM((__a1 % __b), (a0), __b, __q0, r); \ } while(0) #define DDIV(a1,a0,b,q) do { \ - ErtsDigit _tmp; \ + ERTS_DECLARE_DUMMY(ErtsDigit _tmp); \ DDIVREM(a1,a0,b,q,_tmp); \ } while(0) @@ -413,8 +413,8 @@ } while(0) #define DDIV2(a1,a0,b1,b0,q) do { \ - ErtsDigit _tmp_r1; \ - ErtsDigit _tmp_r0; \ + ERTS_DECLARE_DUMMY(ErtsDigit _tmp_r1); \ + ERTS_DECLARE_DUMMY(ErtsDigit _tmp_r0); \ D2DIVREM(a1,a0,b1,b0,q,_tmp_r1,_tmp_r0); \ } while(0) @@ -810,7 +810,9 @@ static dsize_t D_div(ErtsDigit* x, dsize_t xl, ErtsDigit d, ErtsDigit* q, ErtsDi } do { - ErtsDigit q0, a0, b1, b0, b; + ErtsDigit q0, a0, b0; + ERTS_DECLARE_DUMMY(ErtsDigit b); + ERTS_DECLARE_DUMMY(ErtsDigit b1); if (d > a1) { a0 = *xp; |