diff options
author | Dan Gohman <gohman@apple.com> | 2008-06-30 21:33:02 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2008-06-30 21:33:02 +0000 |
commit | 7c6618926a9036fccc44fc58e0e0f47042904e7c (patch) | |
tree | a283c47dffa5a86d3206030af2b7a42afb6c0bf1 | |
parent | cf8462f3004d3fc72217d09e4b3f135d68a50e9d (diff) |
Use plain operator new instead of new char[].
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52927 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/ADT/SmallVector.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/llvm/ADT/SmallVector.h b/include/llvm/ADT/SmallVector.h index 715f28c279..3d1640cb57 100644 --- a/include/llvm/ADT/SmallVector.h +++ b/include/llvm/ADT/SmallVector.h @@ -84,7 +84,7 @@ public: // If this wasn't grown from the inline copy, deallocate the old space. if (!isSmall()) - delete[] reinterpret_cast<char*>(Begin); + operator delete(static_cast<void*>(Begin)); } typedef size_t size_type; @@ -317,8 +317,8 @@ private: /// isSmall - Return true if this is a smallvector which has not had dynamic /// memory allocated for it. bool isSmall() const { - return reinterpret_cast<const void*>(Begin) == - reinterpret_cast<const void*>(&FirstEl); + return static_cast<const void*>(Begin) == + static_cast<const void*>(&FirstEl); } /// grow - double the size of the allocated memory, guaranteeing space for at @@ -346,7 +346,7 @@ void SmallVectorImpl<T>::grow(size_t MinSize) { size_t NewCapacity = 2*CurCapacity; if (NewCapacity < MinSize) NewCapacity = MinSize; - T *NewElts = reinterpret_cast<T*>(new char[NewCapacity*sizeof(T)]); + T *NewElts = static_cast<T*>(operator new(NewCapacity*sizeof(T))); // Copy the elements over. std::uninitialized_copy(Begin, End, NewElts); @@ -356,7 +356,7 @@ void SmallVectorImpl<T>::grow(size_t MinSize) { // If this wasn't grown from the inline copy, deallocate the old space. if (!isSmall()) - delete[] reinterpret_cast<char*>(Begin); + operator delete(static_cast<void*>(Begin)); Begin = NewElts; End = NewElts+CurSize; |