Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17165/src/modules/kernel
Modified Files:
batifthen.mx
Log Message:
propagated changes of Thursday Feb 28 2008 - Saturday Mar 01 2008
from the MonetDB_5-4 branch to the development trunk
Index: batifthen.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/batifthen.mx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- batifthen.mx 28 Feb 2008 17:31:17 -0000 1.15
+++ batifthen.mx 1 Mar 2008 10:28:56 -0000 1.16
@@ -335,11 +335,11 @@
bi = bat_iterator(b);
t = (bit*)Tloc(b,BUNfirst(b));
- if (ATOMvarsized([EMAIL PROTECTED])) {
- tid = *(@1**)tid;
- eid = *(@1**)eid;
- nilptr = (@1*)nilval;
- }
+#if @2
+ tid = *(@1**)tid;
+ eid = *(@1**)eid;
+ nilptr = (@1*)nilval;
+#endif
BATloop(b, p, q) {
if (*t == bit_nil)
BUNfastins(bn, BUNhead(bi,p), (ptr)nilptr);
@@ -377,8 +377,9 @@
t = (bit*) Tloc(b, BUNfirst(b));
- if (ATOMvarsized([EMAIL PROTECTED]))
- nilptr = (@1*)nilval;
+#if @2
+ nilptr = (@1*)nilval;
+#endif
BATloop(b, p, q) {
if (*t == bit_nil)
BUNfastins(bn, BUNhead(bi,p), (ptr)nilptr);
@@ -415,10 +416,10 @@
t = (bit*) Tloc(b,BUNfirst(b));
- if (ATOMvarsized([EMAIL PROTECTED])) {
- val = *(@1**)val;
- nilptr = (@1*)nilval;
- }
+#if @2
+ val = *(@1**)val;
+ nilptr = (@1*)nilval;
+#endif
BATloop(b, p, q) {
if (*t == bit_nil)
BUNfastins(bn, BUNhead(bi,p), (ptr)nilptr);
@@ -454,10 +455,10 @@
t = (bit*) Tloc(b,BUNfirst(b));
- if (ATOMvarsized([EMAIL PROTECTED])) {
- val = *(@1**)val;
- nilptr = (@1*)nilval;
- }
+#if @2
+ val = *(@1**)val;
+ nilptr = (@1*)nilval;
+#endif
BATloop(b, p, q) {
if (*t == bit_nil)
BUNfastins(bn, BUNhead(bi,p), (ptr)nilptr);
@@ -472,6 +473,6 @@
}
@:ifthenImpl(@1)@
@c
-@:ifthenelseDefault(oid)@
-@:ifthenelseDefault(str)@
+@:ifthenelseDefault(oid,0)@
+@:ifthenelseDefault(str,1)@
@}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
