clean up a bunch of fixme's I added, by moving

DirectoryLookup::DirType into SourceManager.h

llvm-svn: 56692

1 files changed, 4 insertions, 8 deletions

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);