aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/libclang/CXCursor.cpp8
-rw-r--r--tools/libclang/CXSourceLocation.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/libclang/CXCursor.cpp b/tools/libclang/CXCursor.cpp
index bdd06bd334..2b2ec3942e 100644
--- 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 fcc78774ee..856481af74 100644
--- 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)