MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: 0693fa5a1b6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0693fa5a1b6d
Modified Files:
        gdk/gdk_atoms.c
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (12 lines):

diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1003,7 +1003,7 @@ strCleanHash(Heap *h, int rebuild)
                                GDK_STRHASH(s, strhash);
                        off = strhash & GDK_STRHASHMASK;
                        bucket = ((stridx_t *) h->base) + off;
-                       *bucket = pos - extralen - sizeof(stridx_t);
+                       *bucket = (stridx_t) (pos - extralen - 
sizeof(stridx_t));
                        pos += GDK_STRLEN(s);
                }
 #ifndef NDEBUG
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list