diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-03-25 10:35:55 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-03-25 10:35:55 +0100 |
| commit | dcf096a77d94a16d46ae553263f9dcd3be5a884b (patch) | |
| tree | f160b6673a419243208c412d82ed30e89c5adbfd /erts/emulator/beam/erl_map.c | |
| parent | 3d184db38d2389c463dd3ad88c34992f8427f30d (diff) | |
| parent | a1520d8bd2b467d5128998a5069611b9e6252653 (diff) | |
| download | otp-dcf096a77d94a16d46ae553263f9dcd3be5a884b.tar.gz otp-dcf096a77d94a16d46ae553263f9dcd3be5a884b.tar.bz2 otp-dcf096a77d94a16d46ae553263f9dcd3be5a884b.zip | |
Merge branch 'egil/fix-term-cmp/OTP-12623' into maint
* egil/fix-term-cmp/OTP-12623:
erts: Fix comparison of exact terms
Diffstat (limited to 'erts/emulator/beam/erl_map.c')
| -rw-r--r-- | erts/emulator/beam/erl_map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c index 5e740aacdd..a180047f6c 100644 --- a/erts/emulator/beam/erl_map.c +++ b/erts/emulator/beam/erl_map.c @@ -400,7 +400,7 @@ BIF_RETTYPE maps_merge_2(BIF_ALIST_2) { Eterm *ks,*vs,*ks1,*vs1,*ks2,*vs2; map_t *mp1,*mp2,*mp_new; Uint n1,n2,i1,i2,need,unused_size=0; - int c = 0; + Sint c = 0; mp1 = (map_t*)map_val(BIF_ARG_1); mp2 = (map_t*)map_val(BIF_ARG_2); @@ -798,7 +798,7 @@ int erts_validate_and_sort_map(map_t* mp) Uint sz = map_get_size(mp); Uint ix,jx; Eterm tmp; - int c; + Sint c; /* sort */ |