[cfe-commits] r39686 - in /cfe/cfe/trunk/Driver: DiagChecker.cpp DiagChecker.h clang.cpp

[bwendlin at cs.uiuc.edu]

Author: bwendlin
Date: Wed Jul 11 11:47:08 2007
New Revision: 39686

URL: http://llvm.org/viewvc/llvm-project?rev=39686&view=rev
Log:
Submitted by: Bill Wendling

Removed unnecessary typedef.

Modified:
    cfe/cfe/trunk/Driver/DiagChecker.cpp
    cfe/cfe/trunk/Driver/DiagChecker.h
    cfe/cfe/trunk/Driver/clang.cpp

Modified: cfe/cfe/trunk/Driver/DiagChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Driver/DiagChecker.cpp?rev=39686&r1=39685&r2=39686&view=diff

==============================================================================
--- cfe/cfe/trunk/Driver/DiagChecker.cpp (original)
+++ cfe/cfe/trunk/Driver/DiagChecker.cpp Wed Jul 11 11:47:08 2007
@@ -13,11 +13,12 @@
 
 #include "LLVMDiagChecker.h"
 #include "ASTStreamers.h"
-#include "TextDiagnosticBuffer.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Lex/Preprocessor.h"
 using namespace clang;
 
+typedef TextDiagnosticBuffer::DiagList DiagList;
+
 // USING THE DIAGNOSTIC CHECKER:
 //
 // Indicating that a line expects an error or a warning is simple. Put a comment
@@ -150,7 +151,7 @@
                              const_diag_iterator d2_begin,
                              const_diag_iterator d2_end,
                              const char *Msg) {
-  TextDiagnosticBuffer::DiagList DiffList;
+  DiagList DiffList;
 
   for (const_diag_iterator I = d1_begin, E = d1_end; I != E; ++I) {
     const std::string &Diag1 = I->second;

Modified: cfe/cfe/trunk/Driver/DiagChecker.h
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Driver/DiagChecker.h?rev=39686&r1=39685&r2=39686&view=diff

==============================================================================
--- cfe/cfe/trunk/Driver/DiagChecker.h (original)
+++ cfe/cfe/trunk/Driver/DiagChecker.h Wed Jul 11 11:47:08 2007
@@ -14,6 +14,7 @@
 #ifndef DRIVER_LLVM_DIAG_CHECKER_H_
 #define DRIVER_LLVM_DIAG_CHECKER_H_
 
+#include "TextDiagnosticBuffer.h"
 #include <string>
 #include <vector>
 
@@ -22,19 +23,20 @@
 class Preprocessor;
 class SourceLocation;
 class SourceManager;
-class TextDiagnosticBuffer;
-
-typedef std::vector<std::pair<SourceLocation, std::string> > DiagList;
 
 void ProcessFileDiagnosticChecking(TextDiagnosticBuffer &DiagClient,
                                    Preprocessor &PP, const std::string &InFile,
                                    SourceManager &SourceMgr,
                                    unsigned MainFileID,
-                                   DiagList &ExpectedErrors,
-                                   DiagList &ExpectedWarnings);
+                                   TextDiagnosticBuffer::DiagList
+                                     &ExpectedErrors,
+                                   TextDiagnosticBuffer::DiagList
+                                     &ExpectedWarnings);
 bool ReportCheckingResults(TextDiagnosticBuffer &DiagClient,
-                           const DiagList &ExpectedErrors,
-                           const DiagList &ExpectedWarnings,
+                           const TextDiagnosticBuffer::DiagList
+                             &ExpectedErrors,
+                           const TextDiagnosticBuffer::DiagList
+                             &ExpectedWarnings,
                            SourceManager &SourceMgr);
 
 } // end clang namespace

Modified: cfe/cfe/trunk/Driver/clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Driver/clang.cpp?rev=39686&r1=39685&r2=39686&view=diff

==============================================================================
--- cfe/cfe/trunk/Driver/clang.cpp (original)
+++ cfe/cfe/trunk/Driver/clang.cpp Wed Jul 11 11:47:08 2007
@@ -25,7 +25,6 @@
 #include "clang.h"
 #include "ASTStreamers.h"
 #include "LLVMDiagChecker.h"
-#include "TextDiagnosticBuffer.h"
 #include "TextDiagnosticPrinter.h"
 #include "clang/Parse/Parser.h"
 #include "clang/Lex/HeaderSearch.h"
@@ -903,8 +902,8 @@
   OurDiagnosticClient.setHeaderSearch(HeaderInfo);
   InitializeIncludePaths(HeaderInfo, FileMgr, Diags, LangInfo);
 
-  DiagList ExpectedErrors;
-  DiagList ExpectedWarnings;
+  TextDiagnosticBuffer::DiagList ExpectedErrors;
+  TextDiagnosticBuffer::DiagList ExpectedWarnings;
   
   for (unsigned i = 0, e = InputFilenames.size(); i != e; ++i) {
     // Set up the preprocessor with these options.