Skip to content

Commit 56ed048

Browse files
committed
[core] Use FileEntryRef and DirectoryEntryRef
1 parent 4f125ec commit 56ed048

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

core/clingutils/src/TClingUtils.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3388,7 +3388,7 @@ std::string ROOT::TMetaUtils::GetFileName(const clang::Decl& decl,
33883388
= HdrSearch.LookupFile(llvm::sys::path::filename(headerFE->getName()),
33893389
SourceLocation(),
33903390
true /*isAngled*/, nullptr/*FromDir*/, foundDir,
3391-
ArrayRef<std::pair<const FileEntry *, const DirectoryEntry *>>(),
3391+
ArrayRef<std::pair<OptionalFileEntryRef, DirectoryEntryRef>>(),
33923392
nullptr/*Searchpath*/, nullptr/*RelPath*/,
33933393
nullptr/*SuggestedModule*/, nullptr/*RequestingModule*/,
33943394
nullptr/*IsMapped*/, nullptr /*IsFrameworkFound*/,
@@ -3448,7 +3448,7 @@ std::string ROOT::TMetaUtils::GetFileName(const clang::Decl& decl,
34483448
ConstSearchDirIterator* FoundDir = nullptr;
34493449
FELong = HdrSearch.LookupFile(trailingPart, SourceLocation(),
34503450
true /*isAngled*/, nullptr/*FromDir*/, FoundDir,
3451-
ArrayRef<std::pair<const FileEntry *, const DirectoryEntry *>>(),
3451+
ArrayRef<std::pair<OptionalFileEntryRef, DirectoryEntryRef>>(),
34523452
nullptr/*Searchpath*/, nullptr/*RelPath*/,
34533453
nullptr/*SuggestedModule*/, nullptr/*RequestingModule*/,
34543454
nullptr/*IsMapped*/, nullptr /*IsFrameworkFound*/);
@@ -3474,7 +3474,7 @@ std::string ROOT::TMetaUtils::GetFileName(const clang::Decl& decl,
34743474
// (or are we back to the previously found spelling, which is fine, too)
34753475
if (HdrSearch.LookupFile(trailingPart, SourceLocation(),
34763476
true /*isAngled*/, nullptr/*FromDir*/, FoundDir,
3477-
ArrayRef<std::pair<const FileEntry *, const DirectoryEntry *>>(),
3477+
ArrayRef<std::pair<OptionalFileEntryRef, DirectoryEntryRef>>(),
34783478
nullptr/*Searchpath*/, nullptr/*RelPath*/,
34793479
nullptr/*SuggestedModule*/, nullptr/*RequestingModule*/,
34803480
nullptr/*IsMapped*/, nullptr /*IsFrameworkFound*/) == FELong) {

core/dictgen/src/TModuleGenerator.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ TModuleGenerator::GetSourceFileKind(const char *filename) const
119119
auto hdrFileEntry
120120
= HdrSearch.LookupFile(filename, clang::SourceLocation(),
121121
true /*isAngled*/, nullptr /*FromDir*/, CurDir,
122-
clang::ArrayRef<std::pair<const clang::FileEntry*,
123-
const clang::DirectoryEntry*>>(),
122+
clang::ArrayRef<std::pair<clang::OptionalFileEntryRef,
123+
clang::DirectoryEntryRef>>(),
124124
nullptr /*SearchPath*/,/*RelativePath*/ nullptr,
125125
nullptr /*RequestingModule*/, nullptr /*SuggestedModule*/,
126126
nullptr /*IsMapped*/, nullptr /*IsFrameworkFound*/);
@@ -581,8 +581,8 @@ bool TModuleGenerator::FindHeader(const std::string &hdrName, std::string &hdrFu
581581
if (auto hdrFileEntry
582582
= HdrSearch.LookupFile(hdrName, clang::SourceLocation(),
583583
true /*isAngled*/, nullptr /*FromDir*/, CurDir,
584-
clang::ArrayRef<std::pair<const clang::FileEntry*,
585-
const clang::DirectoryEntry*>>(),
584+
clang::ArrayRef<std::pair<clang::OptionalFileEntryRef,
585+
clang::DirectoryEntryRef>>(),
586586
nullptr /*SearchPath*/, nullptr /*RelativePath*/,
587587
nullptr /*RequestingModule*/, nullptr/*SuggestedModule*/,
588588
nullptr /*IsMapped*/, nullptr /*IsFrameworkFound*/)) {

core/dictgen/src/rootcling_impl.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3909,7 +3909,7 @@ static bool ModuleContainsHeaders(TModuleGenerator &modGen, clang::HeaderSearch
39093909
header, clang::SourceLocation(),
39103910
/*isAngled*/ false,
39113911
/*FromDir*/ 0, CurDir,
3912-
clang::ArrayRef<std::pair<const clang::FileEntry *, const clang::DirectoryEntry *>>(),
3912+
clang::ArrayRef<std::pair<clang::OptionalFileEntryRef, clang::DirectoryEntryRef>>(),
39133913
/*SearchPath*/ 0,
39143914
/*RelativePath*/ 0,
39153915
/*RequestingModule*/ 0, &SuggestedModule,

core/metacling/src/TCling.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3236,8 +3236,8 @@ Bool_t TCling::IsLoaded(const char* filename) const
32363236
clang::SourceLocation(),
32373237
/*isAngled*/ false,
32383238
/*FromDir*/ nullptr, CurDir,
3239-
clang::ArrayRef<std::pair<const clang::FileEntry *,
3240-
const clang::DirectoryEntry *>>(),
3239+
clang::ArrayRef<std::pair<clang::OptionalFileEntryRef,
3240+
clang::DirectoryEntryRef>>(),
32413241
/*SearchPath*/ nullptr,
32423242
/*RelativePath*/ nullptr,
32433243
/*RequestingModule*/ nullptr,

0 commit comments

Comments
 (0)