diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-03-25 10:40:33 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-03-25 10:40:33 +0100 |
| commit | 7379c418ce610f3cd5a69fd4260efbc0246b994a (patch) | |
| tree | 965b150ee46757a75dfb25020c37ebcea983ec08 /erts/emulator/beam | |
| parent | fdd3ac10233e9c70dc127ee93835298eaaf60074 (diff) | |
| parent | dcf096a77d94a16d46ae553263f9dcd3be5a884b (diff) | |
| download | otp-7379c418ce610f3cd5a69fd4260efbc0246b994a.tar.gz otp-7379c418ce610f3cd5a69fd4260efbc0246b994a.tar.bz2 otp-7379c418ce610f3cd5a69fd4260efbc0246b994a.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/erl_map.c
erts/emulator/test/map_SUITE.erl
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/bif.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_map.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index af02a55b69..cc20ec7440 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -4754,7 +4754,7 @@ BIF_RETTYPE bump_reductions_1(BIF_ALIST_1) } BIF_RETTYPE erts_internal_cmp_term_2(BIF_ALIST_2) { - int res = CMP_TERM(BIF_ARG_1,BIF_ARG_2); + Sint res = CMP_TERM(BIF_ARG_1,BIF_ARG_2); /* ensure -1, 0, 1 result */ if (res < 0) { diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c index bcbda65da0..12e359ee02 100644 --- a/erts/emulator/beam/erl_map.c +++ b/erts/emulator/beam/erl_map.c @@ -937,7 +937,7 @@ static Eterm flatmap_merge(Process *p, Eterm nodeA, Eterm nodeB) { Eterm *ks,*vs,*ks1,*vs1,*ks2,*vs2; flatmap_t *mp1,*mp2,*mp_new; Uint n,n1,n2,i1,i2,need,unused_size=0; - int c = 0; + Sint c = 0; mp1 = (flatmap_t*)flatmap_val(nodeA); mp2 = (flatmap_t*)flatmap_val(nodeB); @@ -2504,7 +2504,7 @@ int erts_validate_and_sort_flatmap(flatmap_t* mp) Uint sz = flatmap_get_size(mp); Uint ix,jx; Eterm tmp; - int c; + Sint c; /* sort */ |