MonetDB: int128 - Merge with jan2014 branch.

[Stefan Manegold]

Changeset: 1195cf3ce7db for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1195cf3ce7db
Modified Files:
        gdk/gdk_group.c
Branch: int128
Log Message:

Merge with jan2014 branch.


diffs (21 lines):

diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -696,7 +696,7 @@ BATgroup_internal(BAT **groups, BAT **ex
                gn->tsorted = 1;
                for (p = 0, q = BATcount(b); p < q; p++) {
                        if ((v = bgrps[w[p]]) == 0xFF && ngrp < 256) {
-                               bgrps[w[p]] = v = ngrp++;
+                               bgrps[w[p]] = v = (unsigned char) ngrp++;
                                if (extents)
                                        exts[v] = b->hseqbase + (oid) p;
                        }
@@ -719,7 +719,7 @@ BATgroup_internal(BAT **groups, BAT **ex
                gn->tsorted = 1;
                for (p = 0, q = BATcount(b); p < q; p++) {
                        if ((v = sgrps[w[p]]) == 0xFFFF && ngrp < 65536) {
-                               sgrps[w[p]] = v = ngrp++;
+                               sgrps[w[p]] = v = (unsigned short) ngrp++;
                                if (extents)
                                        exts[v] = b->hseqbase + (oid) p;
                        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list