clean up a bunch of fixme's I added, by moving
DirectoryLookup::DirType into SourceManager.h
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56692 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 504bc45..a3aaabd 100644
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -675,10 +675,9 @@
// 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(),