Changeset: 580078bad247 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=580078bad247 Modified Files: sql/backends/monet5/vaults/gadget/gadget.c sql/backends/monet5/vaults/gadget/peano.c Branch: data-vaults Log Message:
Fix icc compilation complaints diffs (48 lines): diff --git a/sql/backends/monet5/vaults/gadget/gadget.c b/sql/backends/monet5/vaults/gadget/gadget.c --- a/sql/backends/monet5/vaults/gadget/gadget.c +++ b/sql/backends/monet5/vaults/gadget/gadget.c @@ -1063,7 +1063,6 @@ str gadgetLoadTable(Client cntxt, MalBlk #ifndef NDEBUG int time0; #endif - (void) retval; if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != MAL_SUCCEED) return msg; @@ -1309,7 +1308,6 @@ str gadgetLoadTableAll(Client cntxt, Mal #ifndef NDEBUG int time0; #endif - (void) retval; if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != MAL_SUCCEED) return msg; @@ -1573,7 +1571,6 @@ gadgetLoadTableAll_(mvc *m, sql_schema * #ifndef NDEBUG int time0; #endif - (void) retval; GADGET_LOCK; tbl = mvc_bind_table(m, sch, tname); @@ -1745,8 +1742,6 @@ gadgetLoadTableAll_(mvc *m, sql_schema * retval = fread(binbytes, nbins * 4, 1, streams[i]); #ifndef NDEBUG assert(retval); -#else - (void) retval; #endif for (j = 0; j < nbins; j++) diff --git a/sql/backends/monet5/vaults/gadget/peano.c b/sql/backends/monet5/vaults/gadget/peano.c --- a/sql/backends/monet5/vaults/gadget/peano.c +++ b/sql/backends/monet5/vaults/gadget/peano.c @@ -183,7 +183,7 @@ int saveToFileKeys(char *fileOutPath, ch fwrite((peanokey*)keys, sizeof(peanokey), numPart, fp); else for (i = 0; i < numPart; i++) - fprintf(fp, "%llu\n", keys[i]); + fprintf(fp, "%lld\n", keys[i]); fflush(fp); fclose(fp); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list