Changeset: 8da2b70f1b3f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8da2b70f1b3f
Modified Files:
MonetDB5/src/modules/mal/mat.mx
Branch: Oct2010
Log Message:
fixed compilation (set but unused variable) with assertions disabled
diffs (28 lines):
diff -r 4dc46abb5f69 -r 8da2b70f1b3f MonetDB5/src/modules/mal/mat.mx
--- a/MonetDB5/src/modules/mal/mat.mx Fri Oct 01 08:34:58 2010 +0200
+++ b/MonetDB5/src/modules/mal/mat.mx Fri Oct 01 12:38:56 2010 +0200
@@ -567,14 +567,13 @@
BAT *res = NULL, *map;
/* rest of the args are parts, (excluding result and map) */
BAT **bats = GDKzalloc(sizeof(BAT*) * pci->argc - 2);
- BUN i, cnt = 0, bcnt = 0;
+ BUN i, bcnt = 0;
unsigned int len = pci->argc-2, sorted = 1;
(void) cntxt; (void) mb; (void) stk;
map = BATdescriptor(map_id);
if (!map)
goto error;
- cnt = BATcount(map);
for (i=2; i<(unsigned int)pci->argc; i++) {
bat id = *(bat*) getArgReference(stk,pci,i);
bats[i-2] = BATdescriptor(id);
@@ -584,7 +583,7 @@
if (bats[i-2]->T->sorted != GDK_SORTED)
sorted = 0;
}
- assert(bcnt == cnt);
+ assert(bcnt == BATcount(map));
res = MATproject_(map, bats, len );
if (sorted && res)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
