gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LookupFile takes arguments as ConstSearchDirIterator

Browse Source
This commit is contained in:
Jonas Hahnfeld 2023-01-18 08:42:47 +01:00 committed by jenkins
parent 2113534493
commit 490a3a9359
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Interpreter/AutoloadCallback.cpp
View File

@ -111,9 +111,9 @@ namespace cling {
SourceLocation fileNameLoc;
// Remember this file wth full path, not "./File.h" (ROOT-8863).
bool isAngled = true;
const DirectoryLookup* FromDir = 0;
ConstSearchDirIterator FromDir = nullptr;
const FileEntry* FromFile = 0;
const DirectoryLookup* CurDir = 0;
ConstSearchDirIterator* CurDir = nullptr;
bool needCacheUpdate = false;
if (FileName.equals(m_PrevFileName.first))

2
lib/Interpreter/ClingPragmas.cpp
View File

@ -162,7 +162,7 @@ namespace {
// a call to interpreter parsing header file. It will suffer the same
// issue as if we included the file within the pragma.
if (m_Interp.loadLibrary(FI.FileName, true) != Interpreter::kSuccess) {
const clang::DirectoryLookup *CurDir = nullptr;
clang::ConstSearchDirIterator *CurDir = nullptr;
if (PP.getHeaderSearchInfo().LookupFile(FI.FileName, FI.StartLoc,
/*isAngled*/ false, /*fromDir*/ nullptr, /*CurDir*/ CurDir, /*Includers*/ {},
/*SearchPath*/ nullptr, /*RelativePath*/ nullptr, /*RequestingModule*/ nullptr,

4
lib/Interpreter/ForwardDeclPrinter.cpp
View File

@ -211,9 +211,9 @@ namespace cling {
auto isDirectlyReacheable = [&PP](llvm::StringRef FileName) {
SourceLocation fileNameLoc;
bool isAngled = false;
const DirectoryLookup* FromDir = nullptr;
ConstSearchDirIterator FromDir = nullptr;
const FileEntry* FromFile = nullptr;
const DirectoryLookup* CurDir = nullptr;
ConstSearchDirIterator* CurDir = nullptr;
auto FE = PP.LookupFile(fileNameLoc, FileName, isAngled, FromDir,
FromFile,

4
lib/Interpreter/Interpreter.cpp
View File

@ -1441,9 +1441,9 @@ namespace cling {
// Clang doc says:
// "LookupFrom is set when this is a \#include_next directive, it
// specifies the file to start searching from."
const DirectoryLookup* FromDir = nullptr;
ConstSearchDirIterator FromDir = nullptr;
const FileEntry* FromFile = nullptr;
const DirectoryLookup* CurDir = nullptr;
ConstSearchDirIterator* CurDir = nullptr;
Preprocessor& PP = getCI()->getPreprocessor();
// PP::LookupFile uses it to issue 'nice' diagnostic
SourceLocation fileNameLoc;