MonetDB: default - Merge with Aug2018 branch.

[Sjoerd Mullender]

Changeset: ad9b1904c6fc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad9b1904c6fc
Modified Files:
        clients/odbc/driver/ODBCUtil.c
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (21 lines):

diff --git a/clients/odbc/driver/ODBCUtil.c b/clients/odbc/driver/ODBCUtil.c
--- a/clients/odbc/driver/ODBCUtil.c
+++ b/clients/odbc/driver/ODBCUtil.c
@@ -143,7 +143,7 @@ ODBCwchar2utf8(const SQLWCHAR *src, SQLL
        j = 0;
        while (j < length) {
                if (src[j] <= 0x7F) {
-                       dest[i++] = src[j];
+                       dest[i++] = (SQLCHAR) src[j];
                } else if (src[j] <= 0x7FF) {
                        dest[i++] = 0xC0 | (src[j] >> 6);
                        dest[i++] = 0x80 | (src[j] & 0x3F);
@@ -295,7 +295,7 @@ ODBCutf82wchar(const SQLCHAR *src,
                }
        }
        if (buflenout)
-               *buflenout = i;
+               *buflenout = (SQLSMALLINT) i;
        return NULL;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list