Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14046/src/modules/plain
Modified Files:
aggrX3.mx xtables.mx
Log Message:
Squashed compiler warnings.
Index: aggrX3.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/aggrX3.mx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aggrX3.mx 4 Oct 2007 10:35:17 -0000 1.4
+++ aggrX3.mx 13 Dec 2007 15:26:42 -0000 1.5
@@ -306,7 +306,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst += *t;
+ *dst += (@9) *t;
}
}
}
@@ -369,7 +369,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst *= *t;
+ *dst *= (@9) *t;
}
}
}
@@ -1189,7 +1189,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst += *t;
+ *dst += (@9) *t;
}
}
}
@@ -1265,7 +1265,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst *= *t;
+ *dst *= (@9) *t;
}
}
}
Index: xtables.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/xtables.mx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xtables.mx 7 Nov 2007 21:17:46 -0000 1.8
+++ xtables.mx 13 Dec 2007 15:26:42 -0000 1.9
@@ -719,8 +719,8 @@
assert (d.histo);
histo = BATdescriptor(d.histo);
BATloop(histo, p, q) {
- /* + 4 for a average chain list of 4 */
- r += ((dbl)cnt/SAMPLE_SIZE)/(*(int*)Tloc(histo,p)+4);
+ /* + 4 for an average chain list of 4 */
+ r += (hash_t)
(((dbl)cnt/SAMPLE_SIZE)/(*(int*)Tloc(histo,p)+4));
}
BBPunfix(d.histo);
grp_unfix(&d);
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
