MonetDB: Feb2013 - fix compilation on 32 bit platforms

[Niels Nes]

Changeset: aba643363fea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aba643363fea
Modified Files:
        gdk/gdk_batop.c
        sql/backends/monet5/sql.mx
Branch: Feb2013
Log Message:

fix compilation on 32 bit platforms


diffs (34 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -141,7 +141,9 @@ insert_string_bat(BAT *b, BAT *n, int ap
                }
                tbp = (unsigned char*)Tloc(n,BUNfirst(n)); 
                tsp = (unsigned short*)Tloc(n,BUNfirst(n)); 
+#if SIZEOF_VAR_T == 8
                tip = (unsigned int*)Tloc(n,BUNfirst(n)); 
+#endif
                tvp = (var_t*)Tloc(n,BUNfirst(n)); 
                b->T->varsized = 0;
                b->T->type = tt;
@@ -172,7 +174,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
                                break;
 #endif
                        default:
-                               v = * (var_t *) *tvp;
+                               v = *tvp;
                                tvp++;
                                break;
                        }
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -3637,7 +3637,7 @@ DELTAproject(bat *result, bat *sub, bat 
        }
        if (i) BBPunfix(i->batCacheid);
 
-       tres = BATleftfetchjoin(s, res, BATcount(res));
+       tres = BATleftfetchjoin(s, res, BATcount(s));
        assert(tres);
        BBPunfix(res->batCacheid);
        res = tres;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list