From 1a1f85a9352cfad7035861a2c1bb92ac62e6e9cb Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 18 Mar 2010 21:25:12 +0000 Subject: [PATCH] Try to appease MSVC git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@98875 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Index/annotate-tokens-pp.c | 2 +- tools/CIndex/CIndex.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Index/annotate-tokens-pp.c b/test/Index/annotate-tokens-pp.c index 485786e1c4..5527b4532d 100644 --- a/test/Index/annotate-tokens-pp.c +++ b/test/Index/annotate-tokens-pp.c @@ -16,7 +16,7 @@ int BAR STILL_NOTHING; // CHECK: Identifier: "honk" [2:31 - 2:35] preprocessing directive= // CHECK: Punctuation: "," [2:35 - 2:36] preprocessing directive= // CHECK: Identifier: "warble" [2:36 - 2:42] preprocessing directive= -// CHECK: Punctuation: ")" [2:42 - 2:43] preprocessing directive= +// CHECK: Punctuation: ")" [2:42 - 2:43] preprocesggsing directive= // CHECK: Punctuation: "#" [3:1 - 3:2] preprocessing directive= // CHECK: Identifier: "define" [3:2 - 3:8] preprocessing directive= // CHECK: Identifier: "BAR" [3:9 - 3:12] macro definition=BAR diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp index 47d156c6ce..befba3c4d9 100644 --- a/tools/CIndex/CIndex.cpp +++ b/tools/CIndex/CIndex.cpp @@ -2066,22 +2066,22 @@ namespace { public: explicit ComparePreprocessedEntityLocation(SourceManager &SM) : SM(SM) { } - bool operator()(const PreprocessedEntity *Entity, SourceLocation Loc) { + bool operator()(const PreprocessedEntity *Entity, SourceLocation Loc) const{ return SM.isBeforeInTranslationUnit(Entity->getSourceRange().getEnd(), Loc); } - bool operator()(SourceLocation Loc, const PreprocessedEntity *Entity) { + bool operator()(SourceLocation Loc, const PreprocessedEntity *Entity) const{ return SM.isBeforeInTranslationUnit(Loc, Entity->getSourceRange().getBegin()); } - bool operator()(const PreprocessedEntity *Entity, SourceRange R) { + bool operator()(const PreprocessedEntity *Entity, SourceRange R) const { return SM.isBeforeInTranslationUnit(Entity->getSourceRange().getEnd(), R.getBegin()); } - bool operator()(SourceRange R, const PreprocessedEntity *Entity) { + bool operator()(SourceRange R, const PreprocessedEntity *Entity) const { return SM.isBeforeInTranslationUnit(R.getEnd(), Entity->getSourceRange().getBegin()); } -- 2.40.0