Changeset: e790028ca30a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e790028ca30a
Modified Files:
monetdb5/modules/mal/pp_hash.c
Branch: manti
Log Message:
explicit conversion to oid
diffs (59 lines):
diff --git a/monetdb5/modules/mal/pp_hash.c b/monetdb5/modules/mal/pp_hash.c
--- a/monetdb5/modules/mal/pp_hash.c
+++ b/monetdb5/modules/mal/pp_hash.c
@@ -2479,11 +2479,11 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
assert(ht->gid_NULL != oid_nil); \
mtdcnt++; \
oid_mtd[mtdcnt] = off+i; \
- slt[mtdcnt] = ht->gid_NULL; \
+ slt[mtdcnt] = (oid)ht->gid_NULL; \
mark[mtdcnt] = bit_nil; \
}\
} else { \
- slt[mtdcnt] =
(match_nulls)?ht->gid_NULL:oid_nil; \
+ slt[mtdcnt] =
(match_nulls)?(oid)ht->gid_NULL:oid_nil; \
mark[mtdcnt] = (any &&
ht->has_nil)?bit_nil:false; \
} \
mtdcnt++; \
@@ -2523,11 +2523,11 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
assert(ht->gid_NULL != oid_nil); \
mtdcnt++; \
oid_mtd[mtdcnt] = off+i; \
- slt[mtdcnt] = ht->gid_NULL; \
+ slt[mtdcnt] = (oid)ht->gid_NULL; \
mark[mtdcnt] = bit_nil; \
}\
} else { \
- slt[mtdcnt] =
(match_nulls)?ht->gid_NULL:oid_nil; \
+ slt[mtdcnt] =
(match_nulls)?(oid)ht->gid_NULL:oid_nil; \
mark[mtdcnt] = (any &&
ht->has_nil)?bit_nil:false; \
} \
mtdcnt++; \
@@ -2573,11 +2573,11 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
assert(ht->gid_NULL != oid_nil); \
mtdcnt++; \
oid_mtd[mtdcnt] = off+i; \
- slt[mtdcnt] = ht->gid_NULL; \
+ slt[mtdcnt] = (oid)ht->gid_NULL; \
mark[mtdcnt] = bit_nil; \
}\
} else { \
- slt[mtdcnt] =
(match_nulls)?ht->gid_NULL:oid_nil; \
+ slt[mtdcnt] =
(match_nulls)?(oid)ht->gid_NULL:oid_nil; \
mark[mtdcnt] = (any &&
ht->has_nil)?bit_nil:false; \
} \
mtdcnt++; \
@@ -2622,11 +2622,11 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
assert(ht->gid_NULL != oid_nil); \
mtdcnt++; \
oid_mtd[mtdcnt] = off+i; \
- slt[mtdcnt] = ht->gid_NULL; \
+ slt[mtdcnt] = (oid)ht->gid_NULL; \
mark[mtdcnt] = bit_nil; \
}\
} else { \
- slt[mtdcnt] =
(match_nulls)?ht->gid_NULL:oid_nil; \
+ slt[mtdcnt] =
(match_nulls)?(oid)ht->gid_NULL:oid_nil; \
mark[mtdcnt] = (any &&
ht->has_nil)?bit_nil:false; \
} \
mtdcnt++; \
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
