commit 46766dc31c09d89024de5aba9e22112a56eadbdf
author Douglas Gregor <dgregor@apple.com> Tue Jan 26 19:19:08 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Tue Jan 26 19:19:08 2010 +0000
tree f0ee5964f39cc0ff703bf2048620f75261119653
parent 30a8a272f091054ce92b9daa1992bcff887c3ee4

Eliminate clang_getInstantiationLocationOffset(), and instead add an
offset parameter to clang_getInstantiationLocation(). 


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94573 91177308-0d34-0410-b5e6-96231b3b80d8

tools/c-index-test/c-index-test.c

diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index 243b873..7250cc7 100644
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -151,7 +151,7 @@
     Referenced = clang_getCursorReferenced(Cursor);
     if (!clang_equalCursors(Referenced, clang_getNullCursor())) {
       CXSourceLocation Loc = clang_getCursorLocation(Referenced);
-      clang_getInstantiationLocation(Loc, 0, &line, &column);
+      clang_getInstantiationLocation(Loc, 0, &line, &column, 0);
       printf(":%d:%d", line, column);
     }
 
@@ -164,7 +164,7 @@
   CXSourceLocation Loc = clang_getCursorLocation(Cursor);
   const char *source;
   CXFile file;
-  clang_getInstantiationLocation(Loc, &file, 0, 0);
+  clang_getInstantiationLocation(Loc, &file, 0, 0, 0);
   source = clang_getFileName(file);
   if (!source)
     return "<invalid loc>";  
@@ -189,9 +189,9 @@
   unsigned begin_line, begin_column, end_line, end_column;
   
   clang_getInstantiationLocation(clang_getRangeStart(extent),
-                                 &begin_file, &begin_line, &begin_column);
+                                 &begin_file, &begin_line, &begin_column, 0);
   clang_getInstantiationLocation(clang_getRangeEnd(extent),
-                                 &end_file, &end_line, &end_column);
+                                 &end_file, &end_line, &end_column, 0);
   if (!begin_file || !end_file)
     return;
 
@@ -213,7 +213,7 @@
   if (!Data->Filter || (Cursor.kind == *(enum CXCursorKind *)Data->Filter)) {
     CXSourceLocation Loc = clang_getCursorLocation(Cursor);
     unsigned line, column;
-    clang_getInstantiationLocation(Loc, 0, &line, &column);
+    clang_getInstantiationLocation(Loc, 0, &line, &column, 0);
     printf("// %s: %s:%d:%d: ", FileCheckPrefix,
            GetCursorSource(Cursor), line, column);
     PrintCursor(Cursor);
@@ -257,7 +257,7 @@
       curColumn++;
           
     Loc = clang_getCursorLocation(Cursor);
-    clang_getInstantiationLocation(Loc, &file, 0, 0);
+    clang_getInstantiationLocation(Loc, &file, 0, 0, 0);
     source = clang_getFileName(file);
     if (source) {
       CXSourceLocation RefLoc
@@ -807,9 +807,9 @@
     case CXToken_Comment: kind = "Comment"; break;
     }
     clang_getInstantiationLocation(clang_getRangeStart(extent), 
-                                   0, &start_line, &start_column);
+                                   0, &start_line, &start_column, 0);
     clang_getInstantiationLocation(clang_getRangeEnd(extent),
-                                   0, &end_line, &end_column);
+                                   0, &end_line, &end_column, 0);
     printf("%s: \"%s\" [%d:%d - %d:%d]", kind, clang_getCString(spelling),
            start_line, start_column, end_line, end_column);
     if (!clang_isInvalid(cursors[i].kind)) {