Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -39,7 +39,7 @@ int RageFileDriverSlice::ReadInternal( void *buf, size_t bytes )
|
||||
m_pFile->Seek( m_iFilePos+m_iOffset );
|
||||
|
||||
const int bytes_left = m_iFileSize-this->m_iFilePos;
|
||||
const int got = m_pFile->Read( buf, min( (int) bytes, bytes_left ) );
|
||||
const int got = m_pFile->Read( buf, std::min( (int) bytes, bytes_left ) );
|
||||
if( got == -1 )
|
||||
{
|
||||
SetError( m_pFile->GetError() );
|
||||
@@ -55,7 +55,7 @@ int RageFileDriverSlice::ReadInternal( void *buf, size_t bytes )
|
||||
int RageFileDriverSlice::SeekInternal( int offset )
|
||||
{
|
||||
ASSERT( offset >= 0 );
|
||||
offset = min( offset, m_iFileSize );
|
||||
offset = std::min( offset, m_iFileSize );
|
||||
|
||||
int ret = m_pFile->Seek( m_iOffset + offset );
|
||||
if( ret == -1 )
|
||||
|
||||
Reference in New Issue
Block a user