diff options
Diffstat (limited to 'clang/lib/Lex')
| -rw-r--r-- | clang/lib/Lex/HeaderSearch.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Lex/PTHLexer.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index cf315767b61..c85aaa2ecc0 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -1461,7 +1461,7 @@ std::string HeaderSearch::suggestPathToFileForDiagnostics(const FileEntry *File, if (!SearchDirs[I].isNormalDir()) continue; - const char *Dir = SearchDirs[I].getDir()->getName(); + StringRef Dir = SearchDirs[I].getDir()->getName(); for (auto NI = llvm::sys::path::begin(Name), NE = llvm::sys::path::end(Name), DI = llvm::sys::path::begin(Dir), diff --git a/clang/lib/Lex/PTHLexer.cpp b/clang/lib/Lex/PTHLexer.cpp index 2ccfcc4131f..ec806e84453 100644 --- a/clang/lib/Lex/PTHLexer.cpp +++ b/clang/lib/Lex/PTHLexer.cpp @@ -644,10 +644,10 @@ public: class PTHStatLookupTrait : public PTHFileLookupCommonTrait { public: - typedef const char* external_key_type; // const char* + typedef StringRef external_key_type; // const char* typedef PTHStatData data_type; - static internal_key_type GetInternalKey(const char *path) { + static internal_key_type GetInternalKey(StringRef path) { // The key 'kind' doesn't matter here because it is ignored in EqualKey. return std::make_pair((unsigned char) 0x0, path); } @@ -694,7 +694,7 @@ public: : Cache(FL.getNumBuckets(), FL.getNumEntries(), FL.getBuckets(), FL.getBase()) {} - LookupResult getStat(const char *Path, FileData &Data, bool isFile, + LookupResult getStat(StringRef Path, FileData &Data, bool isFile, std::unique_ptr<vfs::File> *F, vfs::FileSystem &FS) override { // Do the lookup for the file's data in the PTH file. |
