Cleanup compiler warnings on discarding type qualifiers in casts. Switch to C++ style...

[oota-llvm.git] / lib / Target / ARM / ARMConstantPoolValue.cpp

diff --git a/lib/Target/ARM/ARMConstantPoolValue.cpp b/lib/Target/ARM/ARMConstantPoolValue.cpp
index 5a830ca20226535be291842ee3ba42353aa25c0a..cdb3934ca7129b71e6621b7c188fe579ff5e297e 100644 (file)
--- a/lib/Target/ARM/ARMConstantPoolValue.cpp
+++ b/lib/Target/ARM/ARMConstantPoolValue.cpp
@@ -1,4 +1,4 @@
-//===- ARMConstantPoolValue.cpp - ARM constantpool value --------*- C++ -*-===//
+//===-- ARMConstantPoolValue.cpp - ARM constantpool value -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,12 +13,12 @@
 
 #include "ARMConstantPoolValue.h"
 #include "llvm/ADT/FoldingSet.h"
+#include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Constant.h"
 #include "llvm/Constants.h"
 #include "llvm/GlobalValue.h"
-#include "llvm/Type.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Type.h"
 #include <cstdlib>
 using namespace llvm;
 
@@ -209,7 +209,7 @@ ARMConstantPoolSymbol::ARMConstantPoolSymbol(LLVMContext &C, const char *s,
     S(strdup(s)) {}
 
 ARMConstantPoolSymbol::~ARMConstantPoolSymbol() {
-  free((void*)S);
+  free(const_cast<void*>(reinterpret_cast<const void *>(S)));
 }
 
 ARMConstantPoolSymbol *