commit 5ba58a1b3cbe79497380e7ccecbe45c8bdd498c1
author David Greene <greened@obbligato.org> Tue Jan 15 22:09:41 2013 +0000
committer David Greene <greened@obbligato.org> Tue Jan 15 22:09:41 2013 +0000
tree c383d75f7db1f0cbab90345a410935639cbc2187
parent 3f7b3a754e9698d613672dd1f7af3ccd1b42470a

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

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 01bc66b..b1bdc0f 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -2280,7 +2280,8 @@
   llvm::Constant *C = 0;
   if (isUTF16) {
     ArrayRef<uint16_t> Arr =
-      llvm::makeArrayRef<uint16_t>((uint16_t*)Entry.getKey().data(),
+      llvm::makeArrayRef<uint16_t>(reinterpret_cast<uint16_t*>(
+                                     const_cast<char *>(Entry.getKey().data())),
                                    Entry.getKey().size() / 2);
     C = llvm::ConstantDataArray::get(VMContext, Arr);
   } else {