2 files changed, 7 insertions, 4 deletions
diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp
index f4f8a43..4f100f7 100644
--- a/lib/Archive/Archive.cpp
+++ b/lib/Archive/Archive.cpp
@@ -241,7 +241,7 @@ llvm::GetBitcodeSymbols(const unsigned char *BufPtr, unsigned Length,
   // Get the module.
   std::auto_ptr<MemoryBuffer> Buffer(
     MemoryBuffer::getNewMemBuffer(Length, ModuleID.c_str()));
-  memcpy((char*)Buffer->getBufferStart(), BufPtr, Length);
+  memcpy(const_cast<char *>(Buffer->getBufferStart()), BufPtr, Length);
   
   Module *M = ParseBitcodeFile(Buffer.get(), Context, ErrMsg);
   if (!M)
diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 3ef15d2..cbd0bb3 100644
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -349,7 +349,8 @@ Archive::getAllModules(std::vector<Module*>& Modules,
         "(" + I->getPath().str() + ")";
       MemoryBuffer *Buffer =
         MemoryBuffer::getNewMemBuffer(I->getSize(), FullMemberName.c_str());
-      memcpy((char*)Buffer->getBufferStart(), I->getData(), I->getSize());
+      memcpy(const_cast<char *>(Buffer->getBufferStart()),
+             I->getData(), I->getSize());
       
       Module *M = ParseBitcodeFile(Buffer, Context, ErrMessage);
       delete Buffer;
@@ -489,7 +490,8 @@ Archive::findModuleDefiningSymbol(const std::string& symbol,
     mbr->getPath().str() + ")";
   MemoryBuffer *Buffer =MemoryBuffer::getNewMemBuffer(mbr->getSize(),
                                                       FullMemberName.c_str());
-  memcpy((char*)Buffer->getBufferStart(), mbr->getData(), mbr->getSize());
+  memcpy(const_cast<char *>(Buffer->getBufferStart()),
+         mbr->getData(), mbr->getSize());
   
   Module *m = getLazyBitcodeModule(Buffer, Context, ErrMsg);
   if (!m)
@@ -617,7 +619,8 @@ bool Archive::isBitcodeArchive() {
 
     MemoryBuffer *Buffer =
       MemoryBuffer::getNewMemBuffer(I->getSize(), FullMemberName.c_str());
-    memcpy((char*)Buffer->getBufferStart(), I->getData(), I->getSize());
+    memcpy(const_cast<char *>(Buffer->getBufferStart()),
+           I->getData(), I->getSize());
     Module *M = ParseBitcodeFile(Buffer, Context);
     delete Buffer;
     if (!M)