diff options
| author | Taewook Oh <twoh@fb.com> | 2016-06-13 18:32:30 +0000 |
|---|---|---|
| committer | Taewook Oh <twoh@fb.com> | 2016-06-13 18:32:30 +0000 |
| commit | 4d09f68d2c3ae70ad0131bd59aecdfaedfc8189f (patch) | |
| tree | f2e8bb47a124d702a788cc72554c894596ad866e /include/clang/Basic | |
| parent | def8b33bd90fe6b8a47636d41e96875bb1c2ac79 (diff) | |
Revert r272562 for build bot failure (clang-x86-win2008-selfhost)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@272572 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic')
| -rw-r--r-- | include/clang/Basic/DiagnosticLexKinds.td | 7 | ||||
| -rw-r--r-- | include/clang/Basic/FileManager.h | 2 | ||||
| -rw-r--r-- | include/clang/Basic/VirtualFileSystem.h | 7 |
3 files changed, 0 insertions, 16 deletions
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index c80da70d72..f646136133 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -275,13 +275,6 @@ def ext_missing_whitespace_after_macro_name : ExtWarn< def warn_missing_whitespace_after_macro_name : Warning< "whitespace recommended after macro name">; -class NonportablePath : Warning< - "non-portable path to file '%0'; specified path differs in case from file" - " name on disk">; -def pp_nonportable_path : NonportablePath, InGroup<DiagGroup<"nonportable-include-path">>; -def pp_nonportable_system_path : NonportablePath, DefaultIgnore, - InGroup<DiagGroup<"nonportable-system-include-path">>; - def pp_pragma_once_in_main_file : Warning<"#pragma once in main file">, InGroup<DiagGroup<"pragma-once-outside-header">>; def pp_pragma_sysheader_in_main_file : Warning< diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h index b6a9ca7028..17758ec3f3 100644 --- a/include/clang/Basic/FileManager.h +++ b/include/clang/Basic/FileManager.h @@ -52,7 +52,6 @@ public: /// descriptor for the file. class FileEntry { const char *Name; // Name of the file. - std::string RealPathName; // Real path to the file; could be empty. off_t Size; // File size in bytes. time_t ModTime; // Modification time of file. const DirectoryEntry *Dir; // Directory file lives in. @@ -83,7 +82,6 @@ public: } const char *getName() const { return Name; } - StringRef tryGetRealPathName() const { return RealPathName; } bool isValid() const { return IsValid; } off_t getSize() const { return Size; } unsigned getUID() const { return UID; } diff --git a/include/clang/Basic/VirtualFileSystem.h b/include/clang/Basic/VirtualFileSystem.h index 6ac0812dbb..bc09e67878 100644 --- a/include/clang/Basic/VirtualFileSystem.h +++ b/include/clang/Basic/VirtualFileSystem.h @@ -91,13 +91,6 @@ public: virtual ~File(); /// \brief Get the status of the file. virtual llvm::ErrorOr<Status> status() = 0; - /// \brief Get the name of the file - virtual llvm::ErrorOr<std::string> getName() { - if (auto Status = status()) - return Status->getName().str(); - else - return Status.getError(); - } /// \brief Get the contents of the file as a \p MemoryBuffer. virtual llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> getBuffer(const Twine &Name, int64_t FileSize = -1, |