[cfe-commits] r59859 - in /cfe/trunk: include/clang/Lex/Lexer.h lib/Lex/Lexer.cpp

[Chris Lattner]

Author: lattner
Date: Sat Nov 22 00:22:39 2008
New Revision: 59859

URL: http://llvm.org/viewvc/llvm-project?rev=59859&view=rev
Log:
actually, this version isn't really needed.

Modified:
    cfe/trunk/include/clang/Lex/Lexer.h
    cfe/trunk/lib/Lex/Lexer.cpp

Modified: cfe/trunk/include/clang/Lex/Lexer.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/Lexer.h?rev=59859&r1=59858&r2=59859&view=diff

==============================================================================
--- cfe/trunk/include/clang/Lex/Lexer.h (original)
+++ cfe/trunk/include/clang/Lex/Lexer.h Sat Nov 22 00:22:39 2008
@@ -173,7 +173,6 @@
   /// Diag - Forwarding function for diagnostics.  This translate a source
   /// position in the current buffer into a SourceLocation object for rendering.
   DiagnosticBuilder Diag(const char *Loc, unsigned DiagID) const;
-  DiagnosticBuilder Diag(SourceLocation Loc, unsigned DiagID) const;
 
   /// getSourceLocation - Return a source location identifier for the specified
   /// offset in the current file.

Modified: cfe/trunk/lib/Lex/Lexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Lexer.cpp?rev=59859&r1=59858&r2=59859&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/Lexer.cpp (original)
+++ cfe/trunk/lib/Lex/Lexer.cpp Sat Nov 22 00:22:39 2008
@@ -313,11 +313,6 @@
   return PP->Diag(getSourceLocation(Loc), DiagID);
 }
 
-DiagnosticBuilder Lexer::Diag(SourceLocation Loc, unsigned DiagID) const {
-  return PP->Diag(Loc, DiagID);
-}
-
-
 //===----------------------------------------------------------------------===//
 // Trigraph and Escaped Newline Handling Code.
 //===----------------------------------------------------------------------===//
@@ -1153,7 +1148,8 @@
 
   // If we are in a #if directive, emit an error.
   while (!ConditionalStack.empty()) {
-    Diag(ConditionalStack.back().IfLoc, diag::err_pp_unterminated_conditional);
+    PP->Diag(ConditionalStack.back().IfLoc,
+             diag::err_pp_unterminated_conditional);
     ConditionalStack.pop_back();
   }