aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-11-22 06:22:39 +0000
committerChris Lattner <sabre@nondot.org>2008-11-22 06:22:39 +0000
commit30c6476e8ef00caeb3a10ea0228165013a4eb3f3 (patch)
tree18170b839b65c0ab643f62fe9b4e05f6a18467c9
parent306fda76b0818eb7c215094123f2e16729a44aed (diff)
actually, this version isn't really needed.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59859 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Lex/Lexer.h1
-rw-r--r--lib/Lex/Lexer.cpp8
2 files changed, 2 insertions, 7 deletions
diff --git a/include/clang/Lex/Lexer.h b/include/clang/Lex/Lexer.h
index ac32f5cf79..77399e6d56 100644
--- a/include/clang/Lex/Lexer.h
+++ b/include/clang/Lex/Lexer.h
@@ -173,7 +173,6 @@ public:
/// 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.
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index cef848f073..b4d0717cd7 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -313,11 +313,6 @@ DiagnosticBuilder Lexer::Diag(const char *Loc, unsigned DiagID) const {
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 @@ bool Lexer::LexEndOfFile(Token &Result, const char *CurPtr) {
// 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();
}