MonetDB: mtest - Merge with default branch.

[Sjoerd Mullender]

Changeset: 978c72a66c64 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=978c72a66c64
Branch: mtest
Log Message:

Merge with default branch.


diffs (42 lines):

diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -375,10 +375,10 @@ project_str(BAT *restrict l, struct cand
                        v += off;
                        switch (bn->twidth) {
                        case 1:
-                               ((uint8_t *) bn->theap.base)[lo] = v - 
GDK_VAROFFSET;
+                               ((uint8_t *) bn->theap.base)[lo] = (uint8_t) (v 
- GDK_VAROFFSET);
                                break;
                        case 2:
-                               ((uint16_t *) bn->theap.base)[lo] = v - 
GDK_VAROFFSET;
+                               ((uint16_t *) bn->theap.base)[lo] = (uint16_t) 
(v - GDK_VAROFFSET);
                                break;
                        case 4:
                                ((uint32_t *) bn->theap.base)[lo] = (uint32_t) 
v;
@@ -422,10 +422,10 @@ project_str(BAT *restrict l, struct cand
                        v += off;
                        switch (bn->twidth) {
                        case 1:
-                               ((uint8_t *) bn->theap.base)[lo] = v - 
GDK_VAROFFSET;
+                               ((uint8_t *) bn->theap.base)[lo] = (uint8_t) (v 
- GDK_VAROFFSET);
                                break;
                        case 2:
-                               ((uint16_t *) bn->theap.base)[lo] = v - 
GDK_VAROFFSET;
+                               ((uint16_t *) bn->theap.base)[lo] = (uint16_t) 
(v - GDK_VAROFFSET);
                                break;
                        case 4:
                                ((uint32_t *) bn->theap.base)[lo] = (uint32_t) 
v;
@@ -470,10 +470,10 @@ project_str(BAT *restrict l, struct cand
                        v += off;
                        switch (bn->twidth) {
                        case 1:
-                               ((uint8_t *) bn->theap.base)[lo] = v - 
GDK_VAROFFSET;
+                               ((uint8_t *) bn->theap.base)[lo] = (uint8_t) (v 
- GDK_VAROFFSET);
                                break;
                        case 2:
-                               ((uint16_t *) bn->theap.base)[lo] = v - 
GDK_VAROFFSET;
+                               ((uint16_t *) bn->theap.base)[lo] = (uint16_t) 
(v - GDK_VAROFFSET);
                                break;
                        case 4:
                                ((uint32_t *) bn->theap.base)[lo] = (uint32_t) 
v;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list