summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2009-01-22 11:17:19 +0100
committerReinhard Tartler <siretart@tauware.de>2009-01-22 11:17:19 +0100
commit4b83954e9c06a29ac6079d95e0cff30a26422389 (patch)
treece93868de5bb65185269d98c336aec5972ad650b
parentcccc2463bf0866d9889af48f6d139d4c81416a7c (diff)
revert some namespace fixes. they break horribly
-rw-r--r--lib/common/StreamableMemBlock.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common/StreamableMemBlock.cpp b/lib/common/StreamableMemBlock.cpp
index 58cf4043..4548d223 100644
--- a/lib/common/StreamableMemBlock.cpp
+++ b/lib/common/StreamableMemBlock.cpp
@@ -173,7 +173,7 @@ void StreamableMemBlock::Set(IOStream &rStream, int Timeout)
}
catch(...)
{
- std::free(pblock);
+ ::free(pblock);
throw;
}
@@ -224,7 +224,7 @@ void StreamableMemBlock::FreeBlock()
{
if(mpBuffer != 0)
{
- std::free(mpBuffer);
+ ::free(mpBuffer);
}
mpBuffer = 0;
mSize = 0;
@@ -244,7 +244,7 @@ void StreamableMemBlock::AllocateBlock(int Size)
ASSERT(mpBuffer == 0);
if(Size > 0)
{
- mpBuffer = std::malloc(Size);
+ mpBuffer = ::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 = std::realloc(mpBuffer, Size);
+ void *pnewBuffer = ::realloc(mpBuffer, Size);
if(pnewBuffer == 0)
{
throw std::bad_alloc();
@@ -318,7 +318,7 @@ void StreamableMemBlock::ReadFromStream(IOStream &rStream, int Timeout)
}
catch(...)
{
- std::free(pblock);
+ ::free(pblock);
throw;
}