From 5ba58a1b3cbe79497380e7ccecbe45c8bdd498c1 Mon Sep 17 00:00:00 2001 From: David Greene Date: Tue, 15 Jan 2013 22:09:41 +0000 Subject: [PATCH] Fix Const Cast Do proper casting to avoid a cast-away-const error. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172559 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 01bc66b1cd..b1bdc0fb7a 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -2280,7 +2280,8 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) { llvm::Constant *C = 0; if (isUTF16) { ArrayRef Arr = - llvm::makeArrayRef((uint16_t*)Entry.getKey().data(), + llvm::makeArrayRef(reinterpret_cast( + const_cast(Entry.getKey().data())), Entry.getKey().size() / 2); C = llvm::ConstantDataArray::get(VMContext, Arr); } else { -- 2.40.0