astyle formatting
This commit is contained in:
parent
ef28bde3e4
commit
0585588fc7
|
@ -806,8 +806,8 @@ void Preprocessor::preprocess(std::istream &srcCodeStream, std::string &processe
|
||||||
|
|
||||||
if (_settings && !_settings->userIncludes.empty()) {
|
if (_settings && !_settings->userIncludes.empty()) {
|
||||||
for (std::list<std::string>::iterator it = _settings->userIncludes.begin();
|
for (std::list<std::string>::iterator it = _settings->userIncludes.begin();
|
||||||
it != _settings->userIncludes.end();
|
it != _settings->userIncludes.end();
|
||||||
it++) {
|
it++) {
|
||||||
std::string cur = *it;
|
std::string cur = *it;
|
||||||
|
|
||||||
// try to open file
|
// try to open file
|
||||||
|
@ -837,23 +837,23 @@ void Preprocessor::preprocess(std::istream &srcCodeStream, std::string &processe
|
||||||
|
|
||||||
//handleIncludes("#include \"" + cur + "\"\n", cur, includePaths, defs);
|
//handleIncludes("#include \"" + cur + "\"\n", cur, includePaths, defs);
|
||||||
forcedIncludes =
|
forcedIncludes =
|
||||||
forcedIncludes +
|
forcedIncludes +
|
||||||
"#file \"" + cur + "\"\n" +
|
"#file \"" + cur + "\"\n" +
|
||||||
"#line 1\n" +
|
"#line 1\n" +
|
||||||
fileData + "\n" +
|
fileData + "\n" +
|
||||||
"#endfile\n"
|
"#endfile\n"
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!forcedIncludes.empty()) {
|
if (!forcedIncludes.empty()) {
|
||||||
processedFile =
|
processedFile =
|
||||||
forcedIncludes +
|
forcedIncludes +
|
||||||
"#file \"" + filename + "\"\n" +
|
"#file \"" + filename + "\"\n" +
|
||||||
"#line 1\n" +
|
"#line 1\n" +
|
||||||
processedFile +
|
processedFile +
|
||||||
"#endfile\n"
|
"#endfile\n"
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove asm(...)
|
// Remove asm(...)
|
||||||
|
|
Loading…
Reference in New Issue