aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2011-04-11 18:14:39 +0200
committerErlang/OTP <[email protected]>2011-04-11 18:14:39 +0200
commit105334ce0689a5c0f33dc0e653bd9c193d4a5d92 (patch)
treee34b417d78a029d64338707714abf2a28f3a62d6 /erts/emulator
parent6a3ff7ea9207bc18d2ca13666dcc286cbafa7de6 (diff)
parent25ca764f7e2fb11804b7697c05c943469d7b4f88 (diff)
downloadotp-105334ce0689a5c0f33dc0e653bd9c193d4a5d92.tar.gz
otp-105334ce0689a5c0f33dc0e653bd9c193d4a5d92.tar.bz2
otp-105334ce0689a5c0f33dc0e653bd9c193d4a5d92.zip
Merge branch 'sverker/ets_ordered_set_large_smalls/OTP-9181' into maint-r14
* sverker/ets_ordered_set_large_smalls/OTP-9181: Remove truncation error in key comparision for ordered set
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_db_tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c
index 6cdbec3213..a59c0c258d 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -575,7 +575,7 @@ static int db_prev_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
return DB_ERROR_NONE;
}
-static ERTS_INLINE int cmp_key(DbTableTree* tb, Eterm key, Eterm* key_base,
+static ERTS_INLINE Sint cmp_key(DbTableTree* tb, Eterm key, Eterm* key_base,
TreeDbTerm* obj)
{
return cmp_rel(key, key_base,