Changeset: b3a674b93696 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3a674b93696
Modified Files:
monetdb5/modules/mosaic/mosaic_frame.c
monetdb5/modules/mosaic/mosaic_prefix.c
Branch: mosaic
Log Message:
Compilation issues
diffs (42 lines):
diff --git a/monetdb5/modules/mosaic/mosaic_frame.c
b/monetdb5/modules/mosaic/mosaic_frame.c
--- a/monetdb5/modules/mosaic/mosaic_frame.c
+++ b/monetdb5/modules/mosaic/mosaic_frame.c
@@ -194,7 +194,7 @@ MOSskip_frame(Client cntxt, MOStask task
cnt[j]++;\
}\
for(i=0; i< (BUN) hdr->framesize; i++)\
- for(j=i+1; j< hdr->framesize; j++)\
+ for(j=(int)(i+1); j< hdr->framesize; j++)\
if(task->hdr->frame.val##TPE[i]
>task->hdr->frame.val##TPE[j]){\
v= task->hdr->frame.val##TPE[i];\
task->hdr->frame.val##TPE[i] =
task->hdr->frame.val##TPE[j];\
@@ -255,7 +255,7 @@ MOScreateframeDictionary(Client cntxt, M
//assert(hdr->framesize);
// sort it
for(i=0; i< (BUN) hdr->framesize; i++)
- for(j= (BUN)(i+1); j< hdr->framesize; j++)
+ for(j= (int)(i+1); j< hdr->framesize; j++)
if(task->hdr->frame.valint[i]
>task->hdr->frame.valint[j]){
int v=
task->hdr->frame.valint[i];
task->hdr->frame.valint[i] =
task->hdr->frame.valint[j];
diff --git a/monetdb5/modules/mosaic/mosaic_prefix.c
b/monetdb5/modules/mosaic/mosaic_prefix.c
--- a/monetdb5/modules/mosaic/mosaic_prefix.c
+++ b/monetdb5/modules/mosaic/mosaic_prefix.c
@@ -929,7 +929,7 @@ MOSprojection_prefix(Client cntxt, MOSt
int residu;\
TPE value;\
m = ~mask;\
- residu = val & m;\
+ residu = (int)(val & m);\
val = val & mask;\
base = (BitVector) dst;\
w = (TPE*) task->src;\
@@ -972,7 +972,7 @@ MOSsubjoin_prefix(Client cntxt, MOStask
int residu;
lng value;
m = ~mask;
- residu = val & m;
+ residu = (int)(val & m);
val = val & mask;
base = (BitVector) dst;
w = (lng*) task->src;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
