commit 9d72851fec9e9c62570a027d42701562bbf29751
author Chris Lattner <sabre@nondot.org> Mon Oct 27 01:19:25 2008 +0000
committer Chris Lattner <sabre@nondot.org> Mon Oct 27 01:19:25 2008 +0000
tree 03348ee16f7a64beb64a1e917923afd830854984
parent d599850e9e4b30e3cb2384a447cab576742e4d0e

Rename Characteristic_t to CharacteristicKind



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@58224 91177308-0d34-0410-b5e6-96231b3b80d8

Driver/DependencyFile.cpp

diff --git a/Driver/DependencyFile.cpp b/Driver/DependencyFile.cpp
index cd26079..e559edf 100644
--- a/Driver/DependencyFile.cpp
+++ b/Driver/DependencyFile.cpp
@@ -36,7 +36,7 @@
 
 private:
   bool FileMatchesDepCriteria(const char *Filename,
-                              SrcMgr::Characteristic_t FileType);
+                              SrcMgr::CharacteristicKind FileType);
   void OutputDependencyFile();
 
 public:
@@ -47,7 +47,7 @@
                          const char  *&ErrStr);
   ~DependencyFileCallback();
   virtual void FileChanged(SourceLocation Loc, FileChangeReason Reason,
-                           SrcMgr::Characteristic_t FileType);
+                           SrcMgr::CharacteristicKind FileType);
 };
 }
 
@@ -148,7 +148,7 @@
 /// FileMatchesDepCriteria - Determine whether the given Filename should be
 /// considered as a dependency.
 bool DependencyFileCallback::FileMatchesDepCriteria(const char *Filename,
-                                            SrcMgr::Characteristic_t FileType) {
+                                          SrcMgr::CharacteristicKind FileType) {
   if (strcmp(InputFile.c_str(), Filename) != 0 &&
       strcmp("<predefines>", Filename) != 0) {
       if (GenerateDependencyFileNoSysHeaders)
@@ -162,7 +162,7 @@
 
 void DependencyFileCallback::FileChanged(SourceLocation Loc,
                                          FileChangeReason Reason,
-                                         SrcMgr::Characteristic_t FileType) {
+                                         SrcMgr::CharacteristicKind FileType) {
   if (Reason != PPCallbacks::EnterFile)
     return;
 

Driver/PrintPreprocessedOutput.cpp

diff --git a/Driver/PrintPreprocessedOutput.cpp b/Driver/PrintPreprocessedOutput.cpp
index 570b36b..fd150ae 100644
--- a/Driver/PrintPreprocessedOutput.cpp
+++ b/Driver/PrintPreprocessedOutput.cpp
@@ -48,7 +48,7 @@
 private:
   unsigned CurLine;
   bool EmittedTokensOnThisLine;
-  SrcMgr::Characteristic_t FileType;
+  SrcMgr::CharacteristicKind FileType;
   llvm::SmallString<512> CurFilename;
   bool Initialized;
 public:
@@ -65,7 +65,7 @@
   bool hasEmittedTokensOnThisLine() const { return EmittedTokensOnThisLine; }
   
   virtual void FileChanged(SourceLocation Loc, FileChangeReason Reason,
-                           SrcMgr::Characteristic_t FileType);
+                           SrcMgr::CharacteristicKind FileType);
   virtual void Ident(SourceLocation Loc, const std::string &str);
   
 
@@ -143,7 +143,7 @@
 /// position.
 void PrintPPOutputPPCallbacks::FileChanged(SourceLocation Loc,
                                            FileChangeReason Reason,
-                                         SrcMgr::Characteristic_t NewFileType) {
+                                       SrcMgr::CharacteristicKind NewFileType) {
   // Unless we are exiting a #include, make sure to skip ahead to the line the
   // #include directive was at.
   SourceManager &SourceMgr = PP.getSourceManager();