Changeset: c425fc7ee741 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c425fc7ee741
Modified Files:
monetdb5/modules/mal/mosaic_dictionary.c
monetdb5/modules/mal/mosaic_prefix.c
Branch: mosaic
Log Message:
Fix compilations
diffs (33 lines):
diff --git a/monetdb5/modules/mal/mosaic_dictionary.c
b/monetdb5/modules/mal/mosaic_dictionary.c
--- a/monetdb5/modules/mal/mosaic_dictionary.c
+++ b/monetdb5/modules/mal/mosaic_dictionary.c
@@ -43,7 +43,7 @@ MOSadvance_dictionary(Client cntxt, MOSt
assert(cnt > 0);
task->start += (oid) cnt;
task->stop = task->elm;
- bytes = (cnt * task->hdr->bits)/8 + (((cnt * task->hdr->bits) %8) !=
0);
+ bytes = (long) (cnt * task->hdr->bits)/8 + (((cnt * task->hdr->bits)
%8) != 0);
task->blk = (MosaicBlk) (((char*) dst) + wordaligned(bytes, int));
}
diff --git a/monetdb5/modules/mal/mosaic_prefix.c
b/monetdb5/modules/mal/mosaic_prefix.c
--- a/monetdb5/modules/mal/mosaic_prefix.c
+++ b/monetdb5/modules/mal/mosaic_prefix.c
@@ -965,7 +965,7 @@ MOSsubjoin_prefix(Client cntxt, MOStask
case TYPE_lng: join_prefix(lng,ulng); break;
case TYPE_oid: join_prefix(oid,ulng); break;
case TYPE_flt: join_prefix(flt,unsigned int); break;
- case TYPE_dbl: join_prefix(dbl,ulng); break;
+ case TYPE_dbl: join_prefix(dbl,unsigned int); break;
#ifdef HAVE_HGE
case TYPE_hge: join_prefix(hge,unsigned long long); break;
#endif
@@ -975,7 +975,7 @@ MOSsubjoin_prefix(Client cntxt, MOStask
case 1: join_prefix(bte, unsigned char); break;
case 2: join_prefix(sht, unsigned short); break;
case 4: join_prefix(int, unsigned int); break;
- case 8: join_prefix(lng, ulng); break;
+ case 8: join_prefix(lng, unsigned int); break;
}
}
MOSskip_prefix(cntxt,task);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
