diff --git a/grepWinNP3/sktoolslib_mod/SimpleIni.h b/grepWinNP3/sktoolslib_mod/SimpleIni.h index 60bb784f3..3202fd04b 100644 --- a/grepWinNP3/sktoolslib_mod/SimpleIni.h +++ b/grepWinNP3/sktoolslib_mod/SimpleIni.h @@ -214,12 +214,6 @@ # pragma warning (disable: 4127 4503 4702 4786) #endif -// workaround for invalid (false positive) assertion SI_ASSERT(hFile != INVALID_HANDLE_VALUE) -#ifndef _WIN64 -# undef INVALID_HANDLE_VALUE -# define INVALID_HANDLE_VALUE ((HANDLE)INTPTR_MAX) -#endif - // Defines the conversion classes for different libraries. Before including // SimpleIni.h, set the converter that you wish you use by defining one of the // following symbols. @@ -1449,9 +1443,10 @@ CSimpleIniTempl::LoadFile( GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); - SI_ASSERT(hFile != INVALID_HANDLE_VALUE); + //~SI_ASSERT(hFile != INVALID_HANDLE_VALUE); // maybe .ini does not exist: allowed here - if (!IS_VALID_HANDLE(hFile)) { + if (!IS_VALID_HANDLE(hFile)) + { return SI_Error::SI_FILE; } diff --git a/src/Config/SimpleIni.h b/src/Config/SimpleIni.h index 96ad5eae1..6430d5058 100644 --- a/src/Config/SimpleIni.h +++ b/src/Config/SimpleIni.h @@ -214,12 +214,6 @@ # pragma warning (disable: 4127 4503 4702 4786) #endif -// workaround for invalid (false positive) assertion SI_ASSERT(hFile != INVALID_HANDLE_VALUE) -#ifndef _WIN64 -# undef INVALID_HANDLE_VALUE -# define INVALID_HANDLE_VALUE ((HANDLE)INTPTR_MAX) -#endif - // Defines the conversion classes for different libraries. Before including // SimpleIni.h, set the converter that you wish you use by defining one of the // following symbols. @@ -1449,9 +1443,10 @@ CSimpleIniTempl::LoadFile( GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); - SI_ASSERT(hFile != INVALID_HANDLE_VALUE); + //~SI_ASSERT(hFile != INVALID_HANDLE_VALUE); // maybe .ini does not exist: allowed here - if (!IS_VALID_HANDLE(hFile)) { + if (!IS_VALID_HANDLE(hFile)) + { return SI_Error::SI_FILE; }