Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11951/src/mal
Modified Files:
Tag: GDK-2
mal_interpreter.mx
Log Message:
propagated changes of Tuesday Sep 18 2007 - Monday Sep 24 2007
from the development trunk to the GDK-2 branch
There were conflicts in src/modules/kernel/batifthen.mx which I have
tried to resolve, but please check.
Index: mal_interpreter.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v
retrieving revision 1.194.2.3
retrieving revision 1.194.2.4
diff -u -d -r1.194.2.3 -r1.194.2.4
--- mal_interpreter.mx 18 Sep 2007 12:42:51 -0000 1.194.2.3
+++ mal_interpreter.mx 24 Sep 2007 09:41:34 -0000 1.194.2.4
@@ -403,7 +403,7 @@
int exceptionVar, exceptionPC;
str ret=0;
int stamp= -1;
- short *backup= (short*) alloca(mb->maxarg * sizeof(short));
+ bat *backup= (bat*) alloca(mb->maxarg * sizeof(bat));
str *sbackup= (str*) alloca(mb->maxarg * sizeof(str));
lng oldtimer=0;
struct mallinfo oldMemory;
@@ -569,7 +569,7 @@
int exceptionVar, exceptionPC;
str ret=0;
int stamp= -1;
- short *backup= (short*) alloca(mb->maxarg * sizeof(short));
+ bat *backup= (bat*) alloca(mb->maxarg * sizeof(bat));
str *sbackup= (str*) alloca(mb->maxarg * sizeof(str));
lng oldtimer=0;
struct mallinfo oldMemory;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
