aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-04-11 18:08:15 +0200
committerRickard Green <[email protected]>2017-04-11 18:08:15 +0200
commit6fe2b8593d05b09c75baabf94a265135709ebef9 (patch)
tree253d64238d028f2c161e3f39c8072a1093372bd6
parent16634948ce01359c58a4f92234e915864d40d2a8 (diff)
parent92616102d59ae7c51c39176b264b84b32cc21f14 (diff)
downloadotp-6fe2b8593d05b09c75baabf94a265135709ebef9.tar.gz
otp-6fe2b8593d05b09c75baabf94a265135709ebef9.tar.bz2
otp-6fe2b8593d05b09c75baabf94a265135709ebef9.zip
Merge branch 'rickard/pd-hash'
* rickard/pd-hash: Fix type of MAKE_HASH
-rw-r--r--erts/emulator/beam/erl_process_dict.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process_dict.c b/erts/emulator/beam/erl_process_dict.c
index 8311fde025..7cfdf20341 100644
--- a/erts/emulator/beam/erl_process_dict.c
+++ b/erts/emulator/beam/erl_process_dict.c
@@ -54,9 +54,9 @@
#define HASH_RANGE(PDict) ((PDict)->usedSlots)
#define MAKE_HASH(Term) \
- ((is_small(Term)) ? unsigned_val(Term) : \
+ ((is_small(Term)) ? (Uint32) unsigned_val(Term) : \
((is_atom(Term)) ? \
- atom_val(Term) : \
+ (Uint32) atom_val(Term) : \
make_internal_hash(Term)))
#define PD_SZ2BYTES(Sz) (sizeof(ProcDict) + ((Sz) - 1)*sizeof(Eterm))