MonetDB: default - Merge with Jul2015 branch.

[Stefan Manegold]

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

Merge with Jul2015 branch.


diffs (16 lines):

diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -464,10 +464,10 @@ bitFromStr(const char *src, int *len, bi
        while (GDKisspace(*p))
                p++;
        **dst = bit_nil;
-       if (*p == '0' || *p == 0) {
+       if (*p == '0') {
                **dst = FALSE;
                p++;
-       } else if (*p == '1' || *p == 1) {
+       } else if (*p == '1') {
                **dst = TRUE;
                p++;
        } else if (strncasecmp(p, "true",  4) == 0) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list