Skip to content
Snippets Groups Projects
Commit e358fd50 authored by Dmitri Gribenko's avatar Dmitri Gribenko
Browse files

libclang: use C++ casts in CXString.cpp

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172272 91177308-0d34-0410-b5e6-96231b3b80d8
parent 689d747a
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ CXString cxstring::createCXString(const char *String, bool DupString){ ...@@ -44,7 +44,7 @@ CXString cxstring::createCXString(const char *String, bool DupString){
CXString cxstring::createCXString(StringRef String, bool DupString) { CXString cxstring::createCXString(StringRef String, bool DupString) {
CXString Result; CXString Result;
if (DupString || (!String.empty() && String.data()[String.size()] != 0)) { if (DupString || (!String.empty() && String.data()[String.size()] != 0)) {
char *Spelling = (char *)malloc(String.size() + 1); char *Spelling = static_cast<char *>(malloc(String.size() + 1));
memmove(Spelling, String.data(), String.size()); memmove(Spelling, String.data(), String.size());
Spelling[String.size()] = 0; Spelling[String.size()] = 0;
Result.data = Spelling; Result.data = Spelling;
...@@ -112,9 +112,9 @@ bool cxstring::isManagedByPool(CXString str) { ...@@ -112,9 +112,9 @@ bool cxstring::isManagedByPool(CXString str) {
extern "C" { extern "C" {
const char *clang_getCString(CXString string) { const char *clang_getCString(CXString string) {
if (string.private_flags == (unsigned) CXS_StringBuf) { if (string.private_flags == (unsigned) CXS_StringBuf) {
return ((CXStringBuf*)string.data)->Data.data(); return static_cast<const CXStringBuf *>(string.data)->Data.data();
} }
return (const char*) string.data; return static_cast<const char *>(string.data);
} }
void clang_disposeString(CXString string) { void clang_disposeString(CXString string) {
...@@ -126,7 +126,8 @@ void clang_disposeString(CXString string) { ...@@ -126,7 +126,8 @@ void clang_disposeString(CXString string) {
free(const_cast<void *>(string.data)); free(const_cast<void *>(string.data));
break; break;
case CXS_StringBuf: case CXS_StringBuf:
disposeCXStringBuf((CXStringBuf *) string.data); disposeCXStringBuf(static_cast<CXStringBuf *>(
const_cast<void *>(string.data)));
break; break;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment