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

llvm-svn: 173241

diff --git a/clang/tools/libclang/CXCursor.cpp b/clang/tools/libclang/CXCursor.cpp
index bdd06bd..2b2ec39 100644 (file)
--- a/clang/tools/libclang/CXCursor.cpp
+++ b/clang/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/clang/tools/libclang/CXSourceLocation.cpp b/clang/tools/libclang/CXSourceLocation.cpp
index fcc7877..856481a 100644 (file)
--- a/clang/tools/libclang/CXSourceLocation.cpp
+++ b/clang/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)