Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10849/src/modules/kernel
Modified Files:
algebra.mx
Log Message:
cleanup indenting
algebra: work around compiler bug.
Index: algebra.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/algebra.mx,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- algebra.mx 30 Dec 2007 18:08:54 -0000 1.190
+++ algebra.mx 9 Jan 2008 22:55:51 -0000 1.191
@@ -1788,19 +1788,23 @@
int _s = ATOMsize(ATOMtype(b->ttype));
if (ATOMvarsized(b->ttype)) {
memcpy(*(ptr*) ret=GDKmalloc(_s), BUNtvar(bi, @1), _s);
+ } else if (b->ttype == TYPE_void) {
+ *(oid*) ret = b->tseqbase;
+ if (b->tseqbase != oid_nil)
+ *(oid*)ret += @1 - BUNfirst(b);
} else if (b->ttype == TYPE_bat) {
- bat bid = *(bat*) BUNtloc(bi, @1);
+ bat bid = *(bat*) Tloc(b, @1);
*(BAT**) ret = BATdescriptor(bid);
} else if (_s == 4) {
- *(int*) ret = *(int*) BUNtail(bi, @1);
+ *(int*) ret = *(int*) Tloc(b, @1);
} else if (_s == 1) {
- *(bte*) ret = *(bte*) BUNtail(bi, @1);
+ *(bte*) ret = *(bte*) Tloc(b, @1);
} else if (_s == 2) {
- *(sht*) ret = *(sht*) BUNtail(bi, @1);
+ *(sht*) ret = *(sht*) Tloc(b, @1);
} else if (_s == 8) {
- *(lng*) ret = *(lng*) BUNtail(bi, @1);
+ *(lng*) ret = *(lng*) Tloc(b, @1);
} else {
- memcpy(ret, BUNtloc(bi, @1), _s);
+ memcpy(ret, Tloc(b, @1), _s);
}
}
@c
-------------------------------------------------------------------------
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
