MonetDB: headless - remove GDKtype

[mk]

Changeset: f557ad705f41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f557ad705f41
Modified Files:
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
Branch: headless
Log Message:

remove GDKtype


diffs (24 lines):

diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1399,7 +1399,7 @@
                        mb->var[i] = t;
                        resetVarName(mb,cnt);
                }
-               if (isVarConstant(mb,i) )
+               if (isVarConstant(mb,cnt) )
                        mb->cst[mb->ctop++]= cnt;
                vars[i] = cnt;
                if (glb && i != cnt){
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -161,7 +161,7 @@
 #define getVarTmp(M,I)      (M)->var[I]->tmpindex
 #define isTmpVar(M,I)          ((M)->var[I]->tmpindex)
 #define getVarType(M,I)     ((M)->var[I]->type)
-#define getVarGDKType(M,I)      getGDKtype((M)->var[I]->type)
+#define getVarGDKType(M,I)      (M)->var[I]->type.type
 
 #define clrVarFixed(M,I)       ((M)->var[I]->flags &= ~VAR_Fixed)
 #define setVarFixed(M,I)       ((M)->var[I]->flags |= VAR_Fixed)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list