Changeset: 79a38bb7fc34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=79a38bb7fc34
Modified Files:
monetdb5/modules/mal/mosaic_linear.c
Branch: mosaic
Log Message:
fixing compilation and making MOSjoin_linear() work also for types other than
int:
fixed code (type) to avoid
"monetdb5/modules/mal/mosaic_linear.c(674) : warning C4244: '=' : conversion
from 'int' to 'flt', possible loss of data"
diffs (12 lines):
diff --git a/monetdb5/modules/mal/mosaic_linear.c
b/monetdb5/modules/mal/mosaic_linear.c
--- a/monetdb5/modules/mal/mosaic_linear.c
+++ b/monetdb5/modules/mal/mosaic_linear.c
@@ -642,7 +642,7 @@ MOSleftfetchjoin_linear(Client cntxt, M
TYPE step = *(TYPE*) linear_step(task,blk);\
w = (TYPE*) task->src;\
for(n = task->elm, o = 0; n -- > 0; w++,o++)\
- for(oo= (oid) first, val = *(int*) linear_base(blk); oo < (oid)
last; val+=step, oo++)\
+ for(oo= (oid) first, val = *(TYPE*) linear_base(blk); oo <
(oid) last; val+=step, oo++)\
if ( *w == val){\
BUNappend(task->lbat, &oo, FALSE);\
BUNappend(task->rbat, &o, FALSE);\
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list