From 332b5988d8f080aca68901e371b70451f7061fd8 Mon Sep 17 00:00:00 2001 From: Sen Huang Date: Tue, 8 Oct 2019 09:44:24 -0400 Subject: [PATCH] Suppress C4090 warning --- programs/fileio.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/fileio.c b/programs/fileio.c index cc495b858..9ac65abcb 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -658,7 +658,13 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) { } } - qsort((const char**)filenameTableSorted, nbFiles, sizeof(char*), UTIL_compareStr); + /* Silence VS Compiler bug with warning C4090 */ + #if defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__) + #pragma warning (push) + #pragma warning (disable : 4090) + #endif + + qsort(filenameTableSorted, nbFiles, sizeof(char*), UTIL_compareStr); prevElem = filenameTableSorted[0]; for (u = 1; u < nbFiles; ++u) { if (strcmp(prevElem, filenameTableSorted[u]) == 0) { @@ -667,7 +673,11 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) { prevElem = filenameTableSorted[u]; } - free((const char**)filenameTableSorted); + free(filenameTableSorted); + + #if defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__) + #pragma warning (pop) + #endif return 0; } -- 2.47.3