Use const_cast<> to avoid a cast-away-const error.
---
llvm/tools/clang/tools/libclang/CIndex.cpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/llvm/tools/clang/tools/libclang/CIndex.cpp b/llvm/tools/clang/tools/libclang/CIndex.cpp
index 8b29bb4..eababc8 100644
--- a/llvm/tools/clang/tools/libclang/CIndex.cpp
+++ b/llvm/tools/clang/tools/libclang/CIndex.cpp
@@ -123,7 +123,8 @@ CXSourceRange cxloc::translateSourceRange(const SourceManager &SM,
EndLoc = EndLoc.getLocWithOffset(Length);
}
- CXSourceRange Result = { { (void *)&SM, (void *)&LangOpts },
+ CXSourceRange Result = { { const_cast<SourceManager *>(&SM),
+ const_cast<LangOptions *>(&LangOpts) },
R.getBegin().getRawEncoding(),
EndLoc.getRawEncoding() };
return Result;
@@ -4821,7 +4822,7 @@ static void getTokens(ASTUnit *CXXUnit, SourceRange Range,
// - Kind-specific fields
if (Tok.isLiteral()) {
CXTok.int_data[0] = CXToken_Literal;
- CXTok.ptr_data = (void *)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
@@ -5797,7 +5798,7 @@ CXFile clang_getIncludedFile(CXCursor cursor) {
return 0;
InclusionDirective *ID = getCursorInclusionDirective(cursor);
- return (void *)ID->getFile();
+ return const_cast<FileEntry *>(ID->getFile());
}
CXSourceRange clang_Cursor_getCommentRange(CXCursor C) {
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
