Changeset: 783ee945a448 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=783ee945a448
Modified Files:
configure.ag
monetdb5/modules/mal/mal_io.c
Branch: default
Log Message:
make sure we compile with icc 17.0.1 20161005
diffs (48 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -128,6 +128,7 @@ AS_CASE([$CC],
[10.*], [CC="$CC -no-gcc"],
[11.*], [CC="$CC -no-gcc"],
[15.*], [CC="$CC -no-gcc"],
+ [17.*], [CC="$CC -no-gcc"],
[AC_MSG_WARN([icc ($CC) $icc_ver not handled, yet])])])
AS_IF([test -f "$srcdir"/vertoo.data],
@@ -683,6 +684,7 @@ AS_VAR_IF([enable_strict], [yes], [
[10.*], [],
[11.*], [],
[15.*], [],
+ [17.*], [],
[CFLAGS="$CFLAGS -ansi"])
# Be picky; "-Werror" seems to be too rigid for autoconf...
CFLAGS="$CFLAGS -Wall -w2 -Wcheck"
@@ -704,7 +706,8 @@ AS_VAR_IF([enable_strict], [yes], [
# constants like short s = 1234, which is too much
AS_CASE([$icc_ver],
[11.*], [X_CFLAGS="$X_CFLAGS,2259"],
- [15.*], [X_CFLAGS="$X_CFLAGS,2259"])
+ [15.*], [X_CFLAGS="$X_CFLAGS,2259"],
+ [17.*], [X_CFLAGS="$X_CFLAGS,2259"])
AS_CASE([$icc_ver],
[8.[[1-9]]*], [X_CFLAGS="$X_CFLAGS,1572"],
[9.[[1-9]]*], [X_CFLAGS="$X_CFLAGS,1572,1599"],
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -535,12 +535,14 @@ IOtable(Client cntxt, MalBlkPtr mb, MalS
assert(pci->retc == 1);
assert(pci->argc >= 2);
+ memset(piv, 0, sizeof(BAT*) * MAXPARAMS);
for (i = 1; i < pci->argc; i++) {
tpe = getArgType(mb, pci, i);
val = getArgReference(stk, pci, i);
if (!isaBatType(tpe)) {
while (--i >= 1)
- BBPunfix(piv[i]->batCacheid);
+ if (piv[i] != NULL)
+ BBPunfix(piv[i]->batCacheid);
throw(MAL, "io.table", ILLEGAL_ARGUMENT " BAT
expected");
}
if ((piv[i] = BATdescriptor(*(int *) val)) == NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
