MonetDB: leftmart - Merge with default branch.

[Stefan Manegold]

Changeset: 22aca4dd56e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22aca4dd56e1
Modified Files:
        monetdb5/modules/kernel/microbenchmark.c
Branch: leftmart
Log Message:

Merge with default branch.


diffs (57 lines):

diff --git a/monetdb5/modules/kernel/microbenchmark.c 
b/monetdb5/modules/kernel/microbenchmark.c
--- a/monetdb5/modules/kernel/microbenchmark.c
+++ b/monetdb5/modules/kernel/microbenchmark.c
@@ -59,7 +59,7 @@ BATrandom(BAT **bn, oid *base, wrd *size
                *bn = b;
                return GDK_SUCCEED;
        }
-       val = (int * restrict) Tloc(b, BUNfirst(b));
+       val = (int *) Tloc(b, BUNfirst(b));
 
        /* create BUNs with random distribution */
        if (seed != int_nil)
@@ -129,7 +129,7 @@ BATuniform(BAT **bn, oid *base, wrd *siz
                *bn = b;
                return GDK_SUCCEED;
        }
-       val = (int * restrict) Tloc(b, BUNfirst(b));
+       val = (int *) Tloc(b, BUNfirst(b));
 
        /* create BUNs with uniform distribution */
         for (v = 0, i = 0; i < n; i++) {
@@ -202,7 +202,7 @@ BATskewed(BAT **bn, oid *base, wrd *size
                *bn = b;
                return GDK_SUCCEED;
        }
-       val = (int * restrict) Tloc(b, BUNfirst(b));
+       val = (int *) Tloc(b, BUNfirst(b));
 
        /* create BUNs with skewed distribution */
        for (i = 0; i < skewedSize; i++)
@@ -293,14 +293,14 @@ BATnormal(BAT **bn, oid *base, wrd *size
                *bn = b;
                return GDK_SUCCEED;
        }
-       val = (int * restrict) Tloc(b, BUNfirst(b));
+       val = (int *) Tloc(b, BUNfirst(b));
 
-       abs = (unsigned int *restrict) GDKmalloc(d * sizeof(unsigned int));
+       abs = (unsigned int *) GDKmalloc(d * sizeof(unsigned int));
        if (abs == NULL) {
                BBPreclaim(b);
                return GDK_FAIL;
        }
-       rel = (flt *restrict) abs;
+       rel = (flt *) abs;
 
        /* assert(0 <= *mean && *mean < *size); */
 
@@ -323,7 +323,7 @@ BATnormal(BAT **bn, oid *base, wrd *size
                r -= abs[j];
        }
        assert(((ulng) 1 << 32) - r > abs[m]);
-       abs[m] += r;
+       abs[m] += (unsigned int) r;
 
        /* create BUNs with normal distribution */
        for (j = 0, i = 0; i < n && j < d; i++) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list