Explicitly cast away the const-ness instead of doing it implicitly.

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

diff --git a/tools/libclang/CXCursor.cpp b/tools/libclang/CXCursor.cpp
index bdd06bd334ed46da686755a15138733fc3bf29a4..2b2ec3942e3595646683343c8c507f50480afd47 100644 (file)
--- a/tools/libclang/CXCursor.cpp
+++ b/tools/libclang/CXCursor.cpp
@@ -778,7 +778,7 @@ cxcursor::getCursorOverloadedDeclRef(CXCursor C) {
 }
 
 Decl *cxcursor::getCursorDecl(CXCursor Cursor) {
-  return (Decl *)Cursor.data[0];
+  return static_cast<Decl*>(const_cast<void*>(Cursor.data[0]));
 }
 
 Expr *cxcursor::getCursorExpr(CXCursor Cursor) {
@@ -791,15 +791,15 @@ Stmt *cxcursor::getCursorStmt(CXCursor Cursor) {
       Cursor.kind == CXCursor_ObjCClassRef)
     return 0;
 
-  return (Stmt *)Cursor.data[1];
+  return static_cast<Stmt*>(const_cast<void*>(Cursor.data[1]));
 }
 
 Attr *cxcursor::getCursorAttr(CXCursor Cursor) {
-  return (Attr *)Cursor.data[1];
+  return static_cast<Attr*>(const_cast<void*>(Cursor.data[1]));
 }
 
 Decl *cxcursor::getCursorParentDecl(CXCursor Cursor) {
-  return (Decl *)Cursor.data[0];
+  return static_cast<Decl*>(const_cast<void*>(Cursor.data[0]));
 }
 
 ASTContext &cxcursor::getCursorContext(CXCursor Cursor) {

diff --git a/tools/libclang/CXSourceLocation.cpp b/tools/libclang/CXSourceLocation.cpp
index fcc78774ee80257e86bed379c31d3055c46c19a4..856481af74c90e45781a1548f49ead10dd4fcad7 100644 (file)
--- a/tools/libclang/CXSourceLocation.cpp
+++ b/tools/libclang/CXSourceLocation.cpp
@@ -346,7 +346,7 @@ void clang_getFileLocation(CXSourceLocation location,
     return createNullLocation(file, line, column, offset);
 
   if (file)
-    *file = (void *)SM.getFileEntryForID(FID);
+    *file = static_cast<void*>(const_cast<FileEntry*>(SM.getFileEntryForID(FID)));
   if (line)
     *line = SM.getLineNumber(FID, FileOffset);
   if (column)