Changeset: 779ac79772ed for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/779ac79772ed
Modified Files:
monetdb5/modules/mal/pipeline.c
monetdb5/modules/mal/pp_sort.c
Branch: pp_hashjoin
Log Message:
more type fixing
diffs (24 lines):
diff --git a/monetdb5/modules/mal/pipeline.c b/monetdb5/modules/mal/pipeline.c
--- a/monetdb5/modules/mal/pipeline.c
+++ b/monetdb5/modules/mal/pipeline.c
@@ -36,7 +36,7 @@ BATupgrade(BAT *r, BAT *b, bool locked)
if (locked)
MT_lock_unset(&r->theaplock);
if (r->twidth < b->twidth)
- err = GDKupgradevarheap(r, (1L << (8 << (b->tshift -
1))) + GDK_VAROFFSET, 0, 0) != GDK_SUCCEED;
+ err = GDKupgradevarheap(r, (1L << (8L << (b->tshift -
1))) + GDK_VAROFFSET, 0, 0) != GDK_SUCCEED;
if (locked)
MT_lock_set(&r->theaplock);
assert (r->twidth == b->twidth);
diff --git a/monetdb5/modules/mal/pp_sort.c b/monetdb5/modules/mal/pp_sort.c
--- a/monetdb5/modules/mal/pp_sort.c
+++ b/monetdb5/modules/mal/pp_sort.c
@@ -194,7 +194,7 @@ PPsubmerge_any( bat *Rzzl, bat *Rzzb, ba
p = o;
pa = oa;
} else {
- pa = oa - (side?(re-p):(le-p));
+ pa = oa - (int)(side?(re-p):(le-p));
}
} else {
rlen += len;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
