mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #488 from antiagainst/c4996-warning

Browse Source 
Disable C4996 (secure CRT) recommendation on Windows for strtok().
This commit is contained in:
John Kessenich 2016-08-26 13:16:30 -06:00 committed by GitHub
commit 1389e3e63d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
StandAlone/ResourceLimits.cpp
View File

@ -241,8 +241,10 @@ std::string GetDefaultTBuiltInResourceString()
void DecodeResourceLimits(TBuiltInResource* resources, char* config) void DecodeResourceLimits(TBuiltInResource* resources, char* config)
{ {
const char* delims = " \t\n\r"; const char* delims = " \t\n\r";
#pragma warning(suppress: 4996)
const char* token = strtok(config, delims); const char* token = strtok(config, delims);
while (token) { while (token) {
#pragma warning(suppress: 4996)
const char* valueStr = strtok(0, delims); const char* valueStr = strtok(0, delims);
if (valueStr == 0 || ! (valueStr[0] == '-' || (valueStr[0] >= '0' && valueStr[0] <= '9'))) { if (valueStr == 0 || ! (valueStr[0] == '-' || (valueStr[0] >= '0' && valueStr[0] <= '9'))) {
printf("Error: '%s' bad .conf file. Each name must be followed by one number.\n", valueStr ? valueStr : ""); printf("Error: '%s' bad .conf file. Each name must be followed by one number.\n", valueStr ? valueStr : "");
@ -438,6 +440,7 @@ void DecodeResourceLimits(TBuiltInResource* resources, char* config)
else else
printf("Warning: unrecognized limit (%s) in configuration file.\n", token); printf("Warning: unrecognized limit (%s) in configuration file.\n", token);
#pragma warning(suppress: 4996)
token = strtok(0, delims); token = strtok(0, delims);
} }
} }