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

libclang: constness for CXString

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172270 91177308-0d34-0410-b5e6-96231b3b80d8
parent 707a8659
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,7 @@ extern "C" { ...@@ -36,7 +36,7 @@ extern "C" {
* with the string data, call \c clang_disposeString() to free the string. * with the string data, call \c clang_disposeString() to free the string.
*/ */
typedef struct { typedef struct {
void *data; const void *data;
unsigned private_flags; unsigned private_flags;
} CXString; } CXString;
......
...@@ -35,7 +35,7 @@ CXString cxstring::createCXString(const char *String, bool DupString){ ...@@ -35,7 +35,7 @@ CXString cxstring::createCXString(const char *String, bool DupString){
Str.data = strdup(String); Str.data = strdup(String);
Str.private_flags = (unsigned) CXS_Malloc; Str.private_flags = (unsigned) CXS_Malloc;
} else { } else {
Str.data = (void*)String; Str.data = String;
Str.private_flags = (unsigned) CXS_Unmanaged; Str.private_flags = (unsigned) CXS_Unmanaged;
} }
return Str; return Str;
...@@ -50,7 +50,7 @@ CXString cxstring::createCXString(StringRef String, bool DupString) { ...@@ -50,7 +50,7 @@ CXString cxstring::createCXString(StringRef String, bool DupString) {
Result.data = Spelling; Result.data = Spelling;
Result.private_flags = (unsigned) CXS_Malloc; Result.private_flags = (unsigned) CXS_Malloc;
} else { } else {
Result.data = (void*) String.data(); Result.data = String.data();
Result.private_flags = (unsigned) CXS_Unmanaged; Result.private_flags = (unsigned) CXS_Unmanaged;
} }
return Result; return Result;
...@@ -123,7 +123,7 @@ void clang_disposeString(CXString string) { ...@@ -123,7 +123,7 @@ void clang_disposeString(CXString string) {
break; break;
case CXS_Malloc: case CXS_Malloc:
if (string.data) if (string.data)
free((void*)string.data); free(const_cast<void *>(string.data));
break; break;
case CXS_StringBuf: case CXS_StringBuf:
disposeCXStringBuf((CXStringBuf *) string.data); disposeCXStringBuf((CXStringBuf *) string.data);
......
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