aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db_tree.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-06-18 17:33:14 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-06-24 16:22:31 +0200
commit64aa348700cc380f3525be01d3c815f6ecb398cd (patch)
tree55fb3d15a89ea98baafd18ba0188b73e469121fa /erts/emulator/beam/erl_db_tree.c
parentd6712b1c54de471beb1784bb329ea217767f70ff (diff)
downloadotp-64aa348700cc380f3525be01d3c815f6ecb398cd.tar.gz
otp-64aa348700cc380f3525be01d3c815f6ecb398cd.tar.bz2
otp-64aa348700cc380f3525be01d3c815f6ecb398cd.zip
erts: Remove halfword is_same bases macro
Keep is_same macro for readability but remove base pointers.
Diffstat (limited to 'erts/emulator/beam/erl_db_tree.c')
-rw-r--r--erts/emulator/beam/erl_db_tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c
index 0c0218f5f9..d7c4e7e5ba 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -583,7 +583,7 @@ static ERTS_INLINE int cmp_key_eq(DbTableTree* tb, Eterm key, Eterm* key_base,
TreeDbTerm* obj)
{
Eterm obj_key = GETKEY(tb,obj->dbterm.tpl);
- return is_same(key, key_base, obj_key, obj->dbterm.tpl)
+ return is_same(key, obj_key)
|| CMP(key, obj_key) == 0;
}
@@ -2735,7 +2735,7 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done)
*done = 1;
return 0;
}
- if (is_same(a,NULL,b,b_base))
+ if (is_same(a,b))
return 0;
switch (a & _TAG_PRIMARY_MASK) {
@@ -2748,7 +2748,7 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done)
while (1) {
if ((j = do_cmp_partly_bound(*aa++, *bb++, b_base, done)) != 0 || *done)
return j;
- if (is_same(*aa, NULL, *bb, b_base))
+ if (is_same(*aa, *bb))
return 0;
if (is_not_list(*aa) || is_not_list(*bb))
return do_cmp_partly_bound(*aa, *bb, b_base, done);