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

C++ Builder: Fixed compiler errors

This commit is contained in:
Daniel Marjamäki 2011-12-08 22:17:50 +01:00
parent 6029e23189
commit b383bae4ab
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/preprocessor.cpp
View File

@ -1848,8 +1848,11 @@ std::string Preprocessor::handleIncludes(const std::string &code, const std::str
} }
// try to open file // try to open file
std::string filepath;
if (headerType == UserHeader)
filepath = path;
std::ifstream fin; std::ifstream fin;
if (!openHeader(filename, includePaths, headerType == UserHeader ? path : std::string(""), fin)) { if (!openHeader(filename, includePaths, filepath, fin)) {
if (_settings && (headerType == UserHeader || _settings->debugwarnings)) { if (_settings && (headerType == UserHeader || _settings->debugwarnings)) {
if (!_settings->nomsg.isSuppressed("missingInclude", "", 0)) { if (!_settings->nomsg.isSuppressed("missingInclude", "", 0)) {
@ -1928,8 +1931,11 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
// filename contains now a file name e.g. "menu.h" // filename contains now a file name e.g. "menu.h"
std::string processedFile; std::string processedFile;
std::string filepath;
if (headerType == UserHeader)
filepath = paths.back();
std::ifstream fin; std::ifstream fin;
const bool fileOpened(openHeader(filename, includePaths, headerType == UserHeader ? paths.back() : std::string(""), fin)); const bool fileOpened(openHeader(filename, includePaths, filepath, fin));
if (fileOpened) { if (fileOpened) {
filename = Path::simplifyPath(filename.c_str()); filename = Path::simplifyPath(filename.c_str());