King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use standard conforming naming, SUN's compiler needs it

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@686 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2006-06-28 08:04:21 +00:00
parent 742ba0de48
commit 11e532673b
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/SafeFormat.cpp
View file

@ -23,7 +23,7 @@ namespace Loki
void write(std::FILE* f, const char* from, const char* to) {
assert(from <= to);
fwrite(from, 1, to - from, f);
::std::fwrite(from, 1, to - from, f);
}
// Write to a string
@ -50,11 +50,11 @@ namespace Loki
return PrintfState<std::FILE*, char>(stdout, format.c_str());
}
PrintfState<std::FILE*, char> FPrintf(FILE* f, const char* format) {
PrintfState<std::FILE*, char> FPrintf(std::FILE* f, const char* format) {
return PrintfState<std::FILE*, char>(f, format);
}
PrintfState<std::FILE*, char> FPrintf(FILE* f, const std::string& format) {
PrintfState<std::FILE*, char> FPrintf(std::FILE* f, const std::string& format) {
return PrintfState<std::FILE*, char>(f, format.c_str());
}
@ -70,6 +70,9 @@ namespace Loki
}// namespace Loki
// $Log$
// Revision 1.3 2006/06/28 08:04:21 syntheticpp
// use standard conforming naming, SUN's compiler needs it
//
// Revision 1.2 2006/01/16 20:59:53 rich_sposato
// Added cvs keywords.
//

11
src/SmallObj.cpp
View file

@ -312,7 +312,7 @@ bool Chunk::Init( std::size_t blockSize, unsigned char blocks )
#else
// malloc can't throw, so its only way to indicate an error is to return
// a NULL pointer, so we have to check for that.
pData_ = static_cast< unsigned char * >( ::malloc( allocSize ) );
pData_ = static_cast< unsigned char * >( ::std::malloc( allocSize ) );
if ( NULL == pData_ ) return false;
#endif
@ -347,7 +347,7 @@ void Chunk::Release()
#ifdef USE_NEW_TO_ALLOCATE
::operator delete ( pData_ );
#else
::free( static_cast< void * >( pData_ ) );
::std::free( static_cast< void * >( pData_ ) );
#endif
}
@ -1022,7 +1022,7 @@ void * DefaultAllocator( std::size_t numBytes, bool doThrow )
return doThrow ? ::operator new( numBytes ) :
::operator new( numBytes, std::nothrow_t() );
#else
void * p = ::malloc( numBytes );
void * p = ::std::malloc( numBytes );
if ( doThrow && ( NULL == p ) )
throw std::bad_alloc();
return p;
@ -1042,7 +1042,7 @@ void DefaultDeallocator( void * p )
#ifdef USE_NEW_TO_ALLOCATE
::operator delete( p );
#else
::free( p );
::std::free( p );
#endif
}
@ -1226,6 +1226,9 @@ bool SmallObjAllocator::IsCorrupt( void ) const
////////////////////////////////////////////////////////////////////////////////
// $Log$
// Revision 1.29 2006/06/28 08:04:21 syntheticpp
// use standard conforming naming, SUN's compiler needs it
//
// Revision 1.28 2006/02/14 18:20:21 rich_sposato
// Added check for memory leak inside destructor.
//