Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/crackers
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10679
Modified Files:
crackers_joins.mx crackers_sideways.mx
Log Message:
move variable declarations before statements for windows combilation
Index: crackers_joins.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/crackers/crackers_joins.mx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- crackers_joins.mx 15 Jan 2008 11:05:06 -0000 1.2
+++ crackers_joins.mx 15 Jan 2008 13:03:50 -0000 1.3
@@ -1376,6 +1376,7 @@
int foundLow, foundHgh;
oid viewCount, resCount=0;
int gapL=0,gapH=0;
+ oid i;
if (*inclusiveHgh == TRUE) HBound = FALSE;
else HBound = TRUE;
@@ -1412,7 +1413,7 @@
idxFirst = BUNfirst(c);
- for(oid i=1;i<numberOfTuplesLeft;i++){
+ for(i=1;i<numberOfTuplesLeft;i++){
currentValue = *(@1*)Tloc(BATLeft, currentTupleLeft);
currentTupleLeftHead = (oid*)Hloc(BATLeft, currentTupleLeft);
low = currentValue - *c1;
@@ -1477,6 +1478,7 @@
oid numberOfTuplesLeft;
@1 low, hgh;
oid resCount=0;
+ oid i;
if ((BATLeft = BATdescriptor(*bidL)) == NULL)
throw(MAL, "crackers.thetajoin", "Cannot access descriptor");
@@ -1497,7 +1499,7 @@
BATmirror(BATorder(BATmirror(BATRight)));
}
- for(oid i=0;i<numberOfTuplesLeft;i++){
+ for(i=0;i<numberOfTuplesLeft;i++){
currentValue = *(@1*)Tloc(BATLeft, currentTupleLeft);
currentTupleLeftHead = (oid*)Hloc(BATLeft, currentTupleLeft);
low = currentValue - *c1;
Index: crackers_sideways.mx
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/modules/mal/crackers/crackers_sideways.mx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- crackers_sideways.mx 15 Jan 2008 11:27:07 -0000 1.6
+++ crackers_sideways.mx 15 Jan 2008 13:03:50 -0000 1.7
@@ -1610,6 +1610,7 @@
@2 *mapTail;
oid size;
oid pos1,pos2;
+ oid i;
if (nodeLow == NULL)
printf("\n crackers.createPieceMap Unexpected case: Low node
is NULL\n ");
@@ -1629,7 +1630,7 @@
crackerBATHead = (oid*)Hloc(crackerBAT, BUNfirst(crackerBAT)+pos1);
crackerBATTail = (@1 *)Tloc(crackerBAT, BUNfirst(crackerBAT)+pos1);
- for(oid i=0;i<size;i++){
+ for(i=0;i<size;i++){
*mapHead = *crackerBATTail;
*mapTail = *(@2*)Tloc(tailBAT, tailBATFirst + *crackerBATHead);
-------------------------------------------------------------------------
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