Remove uneeded casts

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

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index fa0bd524fb0ab1174989bd93c073807be607de7c..64904fafb259e255f28261b0e30974d824c24dc8 100644 (file)
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -131,8 +131,7 @@ CXSourceRange cxloc::translateSourceRange(const SourceManager &SM,
   }
 
   CXSourceRange Result = {
-    { static_cast<void*>(const_cast<SourceManager*>(&SM)),
-      static_cast<void*>(const_cast<LangOptions*>(&LangOpts)) },
+    { &SM, &LangOpts },
     R.getBegin().getRawEncoding(),
     EndLoc.getRawEncoding()
   };
@@ -4844,8 +4843,7 @@ static void getTokens(ASTUnit *CXXUnit, SourceRange Range,
     //   - Kind-specific fields
     if (Tok.isLiteral()) {
       CXTok.int_data[0] = CXToken_Literal;
-      CXTok.ptr_data =
-        static_cast<void*>(const_cast<char*>(Tok.getLiteralData()));
+      CXTok.ptr_data = const_cast<char *>(Tok.getLiteralData());
     } else if (Tok.is(tok::raw_identifier)) {
       // Lookup the identifier to determine whether we have a keyword.
       IdentifierInfo *II
@@ -5833,7 +5831,7 @@ CXFile clang_getIncludedFile(CXCursor cursor) {
     return 0;
   
   const InclusionDirective *ID = getCursorInclusionDirective(cursor);
-  return static_cast<void*>(const_cast<FileEntry*>(ID->getFile()));
+  return const_cast<FileEntry *>(ID->getFile());
 }
 
 CXSourceRange clang_Cursor_getCommentRange(CXCursor C) {

diff --git a/tools/libclang/CXSourceLocation.cpp b/tools/libclang/CXSourceLocation.cpp
index 856481af74c90e45781a1548f49ead10dd4fcad7..af311eb8d96c7a6b5ae6b14e10f8546bcd9a37fe 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 = static_cast<void*>(const_cast<FileEntry*>(SM.getFileEntryForID(FID)));
+    *file = const_cast<FileEntry *>(SM.getFileEntryForID(FID));
   if (line)
     *line = SM.getLineNumber(FID, FileOffset);
   if (column)