Changeset: e8f9d97d7156 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e8f9d97d7156
Modified Files:
monetdb5/modules/mal/mosaic_variance.c
Branch: mosaic
Log Message:
MOSjoin_variance(): fixed compilation:
fixed code to avoid
"monetdb5/modules/mal/mosaic_variance.c:822:6: error: dereferencing type-punned
pointer will break strict-aliasing rules [-Werror=strict-aliasing]"
diffs (20 lines):
diff --git a/monetdb5/modules/mal/mosaic_variance.c
b/monetdb5/modules/mal/mosaic_variance.c
--- a/monetdb5/modules/mal/mosaic_variance.c
+++ b/monetdb5/modules/mal/mosaic_variance.c
@@ -814,12 +814,13 @@ MOSjoin_variance(Client cntxt, MOStask
default:
if( task->type == TYPE_timestamp)
{ timestamp *w;
- lng *dict= (lng*) (((char*) task->blk) + 2 *
MosaicBlkSize ), val =dict[0];
+ lng *dict = (lng*) (((char*) task->blk) + 2 *
MosaicBlkSize ), lval = dict[0];
+ timestamp *tval = (timestamp*) &lval;
bte *idx = (bte*) (((char*) task->blk) + 2 *
MosaicBlkSize + dictsize * sizeof(timestamp));
- for(oo= (oid) first; first < last; first++,
val+= dict[*idx++], oo++){
+ for(oo= (oid) first; first < last; first++,
lval += dict[*idx++], oo++){
w = (timestamp*) task->src;
for(n = task->elm, o = 0; n -- > 0;
w++,o++)
- if ( w->days ==
((timestamp*)&val)->days && w->msecs == ((timestamp*)&val)->msecs){
+ if ( w->days == tval->days && w->msecs
== tval->msecs){
BUNappend(task->lbat, &oo,
FALSE);
BUNappend(task->rbat, &o,
FALSE);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
