maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make FileManager::getFileSystemOptions consistent with CompilerInstance::getFileSystemOpts 

and CompilerInvocation::getFileSystemOpts by renaming it to getFileSystemOpts,
marking the const-returning access method const and adding a non-const version,
making the function prototypes identical to CompilerInstance::getFileSystemOpts.

llvm-svn: 246026
This commit is contained in:
Yaron Keren 2015-08-26 08:10:22 +00:00
parent 653592d7ce
commit 8dec46cf5a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Basic/FileManager.h
View File

@ -218,7 +218,8 @@ public:
bool CacheFailure = true); bool CacheFailure = true);
/// \brief Returns the current file system options /// \brief Returns the current file system options
const FileSystemOptions &getFileSystemOptions() { return FileSystemOpts; } FileSystemOptions &getFileSystemOpts() { return FileSystemOpts; }
const FileSystemOptions &getFileSystemOpts() const { return FileSystemOpts; }
IntrusiveRefCntPtr<vfs::FileSystem> getVirtualFileSystem() const { IntrusiveRefCntPtr<vfs::FileSystem> getVirtualFileSystem() const {
return FS; return FS;

4
clang/lib/Serialization/ASTWriter.cpp
View File

@ -1326,8 +1326,8 @@ void ASTWriter::WriteControlBlock(Preprocessor &PP, ASTContext &Context,
// File system options. // File system options.
Record.clear(); Record.clear();
const FileSystemOptions &FSOpts const FileSystemOptions &FSOpts =
= Context.getSourceManager().getFileManager().getFileSystemOptions(); Context.getSourceManager().getFileManager().getFileSystemOpts();
AddString(FSOpts.WorkingDir, Record); AddString(FSOpts.WorkingDir, Record);
Stream.EmitRecord(FILE_SYSTEM_OPTIONS, Record); Stream.EmitRecord(FILE_SYSTEM_OPTIONS, Record);