Now that a reasonable deprecation cycle has passed, kill

clang_getCursorLine(), clang_getCursorColumn(),
clang_getCursorSource(), and clang_getCursorSourceFile() outright.

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

diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h
index 7f5d6683032c473eb80e28367cc447161e4f7a4c..80febb7b338930a322dd5d0865eee3e0e3e41c48 100644 (file)
--- a/include/clang-c/Index.h
+++ b/include/clang-c/Index.h
@@ -395,11 +395,6 @@ CINDEX_LINKAGE unsigned clang_equalCursors(CXCursor, CXCursor);
 
 CINDEX_LINKAGE CXString clang_getCursorSpelling(CXCursor);
 
-CINDEX_LINKAGE unsigned clang_getCursorLine(CXCursor); /* deprecate */
-CINDEX_LINKAGE unsigned clang_getCursorColumn(CXCursor); /* deprecate */
-CINDEX_LINKAGE const char *clang_getCursorSource(CXCursor); /* deprecate */
-CINDEX_LINKAGE CXFile clang_getCursorSourceFile(CXCursor); /* deprecate */
-
 /**
  * \brief Retrieve the physical location of the source constructor referenced
  * by the given cursor.

diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp
index 6361174b222f4fedf79d2e7d8d8bb58209190a3c..ba0e2607c633a58d0147689113e7d44fd538e2c4 100644 (file)
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -950,22 +950,6 @@ CXDecl clang_getCursorDecl(CXCursor C) {
   return 0;
 }
 
-unsigned clang_getCursorLine(CXCursor C) {
-  return clang_getCursorLocation(C).line;
-}
-  
-unsigned clang_getCursorColumn(CXCursor C) {
-  return clang_getCursorLocation(C).column;
-}
-
-const char *clang_getCursorSource(CXCursor C) {
-  return clang_getFileName(clang_getCursorLocation(C).file);
-}
-
-CXFile clang_getCursorSourceFile(CXCursor C) {
-  return clang_getCursorLocation(C).file;
-}
-
 CXSourceLocation clang_getCursorLocation(CXCursor C) {
   if (clang_isReference(C.kind)) {
     // FIXME: Return the location of the reference, not of the underlying

diff --git a/tools/CIndex/CIndex.exports b/tools/CIndex/CIndex.exports
index 48cbd2668953b0f46ec6ba609669399b17833309..e3985c1a01a22c8f9fa4c6d42b566fef5ce0d30b 100644 (file)
--- a/tools/CIndex/CIndex.exports
+++ b/tools/CIndex/CIndex.exports
@@ -12,15 +12,11 @@ _clang_getCompletionChunkCompletionString
 _clang_getCompletionChunkKind
 _clang_getCompletionChunkText
 _clang_getCursor
-_clang_getCursorColumn
 _clang_getCursorDecl
 _clang_getCursorFromDecl
 _clang_getCursorKind
 _clang_getCursorKindSpelling
-_clang_getCursorLine
 _clang_getCursorLocation
-_clang_getCursorSource
-_clang_getCursorSourceFile
 _clang_getCursorSpelling
 _clang_getCursorUSR
 _clang_getDeclColumn