diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-12-18 00:19:12 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-12-18 00:19:12 +0000 |
| commit | 472ccff00cdbcd095c3ba933b9e3f202719f118f (patch) | |
| tree | a2e0da6cafcc26882139c047fe98a16e752664ec /tools | |
| parent | df344dfb663f99184e734f5d14b5fc9b2725aec2 (diff) | |
Replace all uses of PathV1::getLast with PathV2::filename.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122117 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/driver/driver.cpp | 6 | ||||
| -rw-r--r-- | tools/libclang/CIndexUSRs.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index d210a4018a..cd249c46dd 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -312,9 +312,9 @@ int main(int argc_, const char **argv_) { llvm::sys::Path InstalledPath(argv[0]); // Do a PATH lookup, if there are no directory components. - if (InstalledPath.getLast() == InstalledPath.str()) { - llvm::sys::Path Tmp = - llvm::sys::Program::FindProgramByName(InstalledPath.getLast()); + if (llvm::sys::path::filename(InstalledPath.str()) == InstalledPath.str()) { + llvm::sys::Path Tmp = llvm::sys::Program::FindProgramByName( + llvm::sys::path::filename(InstalledPath.str())); if (!Tmp.empty()) InstalledPath = Tmp; } diff --git a/tools/libclang/CIndexUSRs.cpp b/tools/libclang/CIndexUSRs.cpp index 8a1d4233c1..5861ee6309 100644 --- a/tools/libclang/CIndexUSRs.cpp +++ b/tools/libclang/CIndexUSRs.cpp @@ -488,8 +488,7 @@ bool USRGenerator::GenLoc(const Decl *D) { const std::pair<FileID, unsigned> &Decomposed = SM.getDecomposedLoc(L); const FileEntry *FE = SM.getFileEntryForID(Decomposed.first); if (FE) { - llvm::sys::Path P(FE->getName()); - Out << P.getLast(); + Out << llvm::sys::path::filename(FE->getName()); } else { // This case really isn't interesting. |