aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/Index/annotate-tokens-pp.c2
-rw-r--r--tools/CIndex/CIndex.cpp14
2 files changed, 15 insertions, 1 deletions
diff --git a/test/Index/annotate-tokens-pp.c b/test/Index/annotate-tokens-pp.c
index 5527b4532d..485786e1c4 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] preprocesggsing directive=
+// CHECK: Punctuation: ")" [2:42 - 2:43] preprocessing 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 befba3c4d9..4cf49613e3 100644
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -2085,6 +2085,20 @@ namespace {
return SM.isBeforeInTranslationUnit(R.getEnd(),
Entity->getSourceRange().getBegin());
}
+
+ bool operator()(const PreprocessedEntity *Entity1,
+ const PreprocessedEntity *Entity2) const {
+ return SM.isBeforeInTranslationUnit(Entity1->getSourceRange().getEnd(),
+ Entity2->getSourceRange().getBegin());
+ }
+
+ bool operator()(SourceRange R1, SourceRange R2) const {
+ return SM.isBeforeInTranslationUnit(R1.getEnd(), R2.getBegin());
+ }
+
+ bool operator()(SourceLocation Loc1, SourceLocation Loc2) const {
+ return SM.isBeforeInTranslationUnit(Loc1, Loc2);
+ }
};
}