Get rid of the static FileManager::FixupRelativePath.
llvm-svn: 127573
diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp
index add4ec0..6512d76 100644
--- a/clang/lib/Basic/FileManager.cpp
+++ b/clang/lib/Basic/FileManager.cpp
@@ -450,22 +450,18 @@
return UFE;
}
-void FileManager::FixupRelativePath(llvm::SmallVectorImpl<char> &path,
- const FileSystemOptions &FSOpts) {
+void FileManager::FixupRelativePath(llvm::SmallVectorImpl<char> &path) const {
llvm::StringRef pathRef(path.data(), path.size());
- if (FSOpts.WorkingDir.empty() || llvm::sys::path::is_absolute(pathRef))
+ if (FileSystemOpts.WorkingDir.empty()
+ || llvm::sys::path::is_absolute(pathRef))
return;
- llvm::SmallString<128> NewPath(FSOpts.WorkingDir);
+ llvm::SmallString<128> NewPath(FileSystemOpts.WorkingDir);
llvm::sys::path::append(NewPath, pathRef);
path = NewPath;
}
-void FileManager::FixupRelativePath(llvm::SmallVectorImpl<char> &path) const {
- FixupRelativePath(path, FileSystemOpts);
-}
-
llvm::MemoryBuffer *FileManager::
getBufferForFile(const FileEntry *Entry, std::string *ErrorStr) {
llvm::OwningPtr<llvm::MemoryBuffer> Result;