walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2019-03-27 18:15:12 +01:00
parent 574b77cf1f
commit 4a45655bc2
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/importproject.cpp
View File

@ -250,14 +250,11 @@ void ImportProject::FileSettings::parseCommand(const std::string &command)
std::string stddef;
if (standard == "c++98" || standard == "gnu++98" || standard == "c++03" || standard == "gnu++03") {
stddef = "199711L";
}
else if (standard == "c++11" || standard == "gnu++11"|| standard == "c++0x" || standard == "gnu++0x") {
} else if (standard == "c++11" || standard == "gnu++11"|| standard == "c++0x" || standard == "gnu++0x") {
stddef = "201103L";
}
else if (standard == "c++14" || standard == "gnu++14" || standard == "c++1y" || standard == "gnu++1y") {
} else if (standard == "c++14" || standard == "gnu++14" || standard == "c++1y" || standard == "gnu++1y") {
stddef = "201402L";
}
else if (standard == "c++17" || standard == "gnu++17" || standard == "c++1z" || standard == "gnu++1z") {
} else if (standard == "c++17" || standard == "gnu++17" || standard == "c++1z" || standard == "gnu++1z") {
stddef = "201703L";
}
@ -269,8 +266,7 @@ void ImportProject::FileSettings::parseCommand(const std::string &command)
defs += "__cplusplus=";
defs += stddef;
defs += ";";
}
else if (standard.compare(0, 1, "c") || standard.compare(0, 3, "gnu")) {
} else if (standard.compare(0, 1, "c") || standard.compare(0, 3, "gnu")) {
if (standard == "c90" || standard == "iso9899:1990" || standard == "gnu90" || standard == "iso9899:199409") {
// __STDC_VERSION__ is not set for C90 although the macro was added in the 1994 amendments
continue;
@ -280,11 +276,9 @@ void ImportProject::FileSettings::parseCommand(const std::string &command)
if (standard == "c99" || standard == "iso9899:1999" || standard == "gnu99") {
stddef = "199901L";
}
else if (standard == "c11" || standard == "iso9899:2011" || standard == "gnu11" || standard == "c1x" || standard == "gnu1x") {
} else if (standard == "c11" || standard == "iso9899:2011" || standard == "gnu11" || standard == "c1x" || standard == "gnu1x") {
stddef = "201112L";
}
else if (standard == "c17") {
} else if (standard == "c17") {
stddef = "201710L";
}
@ -301,27 +295,22 @@ void ImportProject::FileSettings::parseCommand(const std::string &command)
++pos;
const std::string isystem = readUntil(command, &pos, " ");
systemIncludePaths.push_back(isystem);
}
else if (F=='m') {
} else if (F=='m') {
if (fval == "unicode") {
defs += "UNICODE";
defs += ";";
}
}
else if (F=='f') {
} else if (F=='f') {
if (fval == "pic") {
defs += "__pic__";
defs += ";";
}
else if (fval == "PIC") {
} else if (fval == "PIC") {
defs += "__PIC__";
defs += ";";
}
else if (fval == "pie") {
} else if (fval == "pie") {
defs += "__pie__";
defs += ";";
}
else if (fval == "PIE") {
} else if (fval == "PIE") {
defs += "__PIE__";
defs += ";";
}