Casting to void* to avoid C4090 warnings

This commit is contained in:
Sen Huang 2019-10-08 09:54:59 -04:00
parent 332b5988d8
commit 6e406b55ee

View File

@ -658,13 +658,7 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) {
} }
} }
/* Silence VS Compiler bug with warning C4090 */ qsort((void*)filenameTableSorted, nbFiles, sizeof(char*), UTIL_compareStr);
#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]; prevElem = filenameTableSorted[0];
for (u = 1; u < nbFiles; ++u) { for (u = 1; u < nbFiles; ++u) {
if (strcmp(prevElem, filenameTableSorted[u]) == 0) { if (strcmp(prevElem, filenameTableSorted[u]) == 0) {
@ -673,11 +667,7 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) {
prevElem = filenameTableSorted[u]; prevElem = filenameTableSorted[u];
} }
free(filenameTableSorted); free((void*)filenameTableSorted);
#if defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__)
#pragma warning (pop)
#endif
return 0; return 0;
} }