diff options
Diffstat (limited to 'clang/lib/Lex')
| -rw-r--r-- | clang/lib/Lex/PPDirectives.cpp | 7 | ||||
| -rw-r--r-- | clang/lib/Lex/PPLexerChange.cpp | 12 | ||||
| -rw-r--r-- | clang/lib/Lex/Pragma.cpp | 3 |
3 files changed, 8 insertions, 14 deletions
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 504bc45dca4..a3aaabd298d 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -675,10 +675,9 @@ void Preprocessor::HandleIncludeDirective(Token &IncludeTok, // The #included file will be considered to be a system header if either it is // in a system include directory, or if the #includer is a system include // header. - unsigned FileCharacter = - // FIXME: Casts - std::max((unsigned)HeaderInfo.getFileDirFlavor(File), - SourceMgr.getDirCharacteristic(getCurrentFileLexer()->getFileLoc())); + SrcMgr::Characteristic_t FileCharacter = + std::max(HeaderInfo.getFileDirFlavor(File), + SourceMgr.getFileCharacteristic(getCurrentFileLexer()->getFileLoc())); // Look up the file, create a File ID for it. unsigned FileID = SourceMgr.createFileID(File, FilenameTok.getLocation(), diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp index 1522bf5e8ca..ccaddf52ed5 100644 --- a/clang/lib/Lex/PPLexerChange.cpp +++ b/clang/lib/Lex/PPLexerChange.cpp @@ -95,10 +95,8 @@ void Preprocessor::EnterSourceFileWithLexer(Lexer *TheLexer, // Notify the client, if desired, that we are in a new source file. if (Callbacks && !CurLexer->Is_PragmaLexer) { - DirectoryLookup::DirType FileType = - // FIXME: - (DirectoryLookup::DirType) - SourceMgr.getDirCharacteristic(CurLexer->getFileLoc()); + SrcMgr::Characteristic_t FileType = + SourceMgr.getFileCharacteristic(CurLexer->getFileLoc()); Callbacks->FileChanged(CurLexer->getFileLoc(), PPCallbacks::EnterFile, FileType); @@ -180,10 +178,8 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) { // Notify the client, if desired, that we are in a new source file. if (Callbacks && !isEndOfMacro && CurLexer) { - DirectoryLookup::DirType FileType = - // FIXME: - (DirectoryLookup::DirType) - SourceMgr.getDirCharacteristic(CurLexer->getFileLoc()); + SrcMgr::Characteristic_t FileType = + SourceMgr.getFileCharacteristic(CurLexer->getFileLoc()); Callbacks->FileChanged(CurLexer->getSourceLocation(CurLexer->BufferPtr), PPCallbacks::ExitFile, FileType); diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp index e6955d762fa..b6f5ac49360 100644 --- a/clang/lib/Lex/Pragma.cpp +++ b/clang/lib/Lex/Pragma.cpp @@ -239,8 +239,7 @@ void Preprocessor::HandlePragmaSystemHeader(Token &SysHeaderTok) { // Notify the client, if desired, that we are in a new source file. if (Callbacks) Callbacks->FileChanged(TheLexer->getSourceLocation(TheLexer->BufferPtr), - PPCallbacks::SystemHeaderPragma, - DirectoryLookup::SystemHeaderDir); + PPCallbacks::SystemHeaderPragma, SrcMgr::C_System); } /// HandlePragmaDependency - Handle #pragma GCC dependency "foo" blah. |
