diff options
Diffstat (limited to 'lib/common/StreamableMemBlock.cpp')
| -rw-r--r-- | lib/common/StreamableMemBlock.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/common/StreamableMemBlock.cpp b/lib/common/StreamableMemBlock.cpp index cf5d5316..58cf4043 100644 --- a/lib/common/StreamableMemBlock.cpp +++ b/lib/common/StreamableMemBlock.cpp @@ -49,7 +49,7 @@ #include "Box.h" #include <new> -#include <stdlib.h> +#include <cstdlib> #include <string.h> #include "StreamableMemBlock.h" @@ -173,7 +173,7 @@ void StreamableMemBlock::Set(IOStream &rStream, int Timeout) } catch(...) { - ::free(pblock); + std::free(pblock); throw; } @@ -224,7 +224,7 @@ void StreamableMemBlock::FreeBlock() { if(mpBuffer != 0) { - ::free(mpBuffer); + std::free(mpBuffer); } mpBuffer = 0; mSize = 0; @@ -244,7 +244,7 @@ void StreamableMemBlock::AllocateBlock(int Size) ASSERT(mpBuffer == 0); if(Size > 0) { - mpBuffer = ::malloc(Size); + mpBuffer = std::malloc(Size); if(mpBuffer == 0) { throw std::bad_alloc(); @@ -267,7 +267,7 @@ void StreamableMemBlock::ResizeBlock(int Size) ASSERT(Size > 0); if(Size > 0) { - void *pnewBuffer = ::realloc(mpBuffer, Size); + void *pnewBuffer = std::realloc(mpBuffer, Size); if(pnewBuffer == 0) { throw std::bad_alloc(); @@ -318,7 +318,7 @@ void StreamableMemBlock::ReadFromStream(IOStream &rStream, int Timeout) } catch(...) { - ::free(pblock); + std::free(pblock); throw; } |