commit e4ea879fe73581bc70a9bfbfddc7ca06b5c0768b
author Dmitri Gribenko <gribozavr@gmail.com> Wed Jan 23 15:56:07 2013 +0000
committer Dmitri Gribenko <gribozavr@gmail.com> Wed Jan 23 15:56:07 2013 +0000
tree a916aaeefee1075518aec033f34395e8c65c8dd9
parent 13cb7c2c46bca6f52fd217091ef2922a3eca46f5

Remove uneeded casts


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

tools/libclang/CIndex.cpp

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index fa0bd52..64904fa 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -131,8 +131,7 @@
   }
 
   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 @@
     //   - 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 @@
     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) {

tools/libclang/CXSourceLocation.cpp

diff --git a/tools/libclang/CXSourceLocation.cpp b/tools/libclang/CXSourceLocation.cpp
index 856481a..af311eb 100644
--- a/tools/libclang/CXSourceLocation.cpp
+++ b/tools/libclang/CXSourceLocation.cpp
@@ -346,7 +346,7 @@
     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)