[cfe-commits] r98878 - in /cfe/trunk: test/Index/annotate-tokens-pp.c tools/CIndex/CIndex.cpp

[Douglas Gregor]

Author: dgregor
Date: Thu Mar 18 16:28:30 2010
New Revision: 98878

URL: http://llvm.org/viewvc/llvm-project?rev=98878&view=rev
Log:
Try to appease MSVC's standard library

Modified:
    cfe/trunk/test/Index/annotate-tokens-pp.c
    cfe/trunk/tools/CIndex/CIndex.cpp

Modified: cfe/trunk/test/Index/annotate-tokens-pp.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/annotate-tokens-pp.c?rev=98878&r1=98877&r2=98878&view=diff
==============================================================================
--- cfe/trunk/test/Index/annotate-tokens-pp.c (original)
+++ cfe/trunk/test/Index/annotate-tokens-pp.c Thu Mar 18 16:28:30 2010
@@ -16,7 +16,7 @@
 // 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

Modified: cfe/trunk/tools/CIndex/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.cpp?rev=98878&r1=98877&r2=98878&view=diff
==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.cpp (original)
+++ cfe/trunk/tools/CIndex/CIndex.cpp Thu Mar 18 16:28:30 2010
@@ -2085,6 +2085,20 @@
       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);
+    }
   };
 }