From: <cn...@us...> - 2009-10-27 03:09:40
|
Revision: 586 http://hgengine.svn.sourceforge.net/hgengine/?rev=586&view=rev Author: cnlohr Date: 2009-10-27 03:09:34 +0000 (Tue, 27 Oct 2009) Log Message: ----------- Write should not be changing the contents of what you are writing. Modified Paths: -------------- Mercury2/src/MercuryFile.h Mercury2/src/MercuryFileDriverDirect.cpp Mercury2/src/MercuryFileDriverDirect.h Mercury2/src/MercuryFileDriverPacked.cpp Mercury2/src/MercuryFileDriverPacked.h Mercury2/src/MercuryFileDriverZipped.cpp Mercury2/src/MercuryFileDriverZipped.h Modified: Mercury2/src/MercuryFile.h =================================================================== --- Mercury2/src/MercuryFile.h 2009-10-26 22:16:58 UTC (rev 585) +++ Mercury2/src/MercuryFile.h 2009-10-27 03:09:34 UTC (rev 586) @@ -34,7 +34,7 @@ ///Return the length of the file (in bytes) virtual unsigned long Length() = 0; ///Writes length bytes, returns true if it wrote successfully - virtual bool Write( void * data, unsigned long length ) = 0; + virtual bool Write( const void * data, unsigned long length ) = 0; ///Returns the number of bytes read virtual unsigned long Read( void * data, unsigned long length ) = 0; ///Reads one line from the file. Modified: Mercury2/src/MercuryFileDriverDirect.cpp =================================================================== --- Mercury2/src/MercuryFileDriverDirect.cpp 2009-10-26 22:16:58 UTC (rev 585) +++ Mercury2/src/MercuryFileDriverDirect.cpp 2009-10-27 03:09:34 UTC (rev 586) @@ -139,7 +139,7 @@ return ret; } -bool MercuryFileObjectDirect::Write( void * data, unsigned long length ) +bool MercuryFileObjectDirect::Write( const void * data, unsigned long length ) { if ( m_fF == NULL ) return false; Modified: Mercury2/src/MercuryFileDriverDirect.h =================================================================== --- Mercury2/src/MercuryFileDriverDirect.h 2009-10-26 22:16:58 UTC (rev 585) +++ Mercury2/src/MercuryFileDriverDirect.h 2009-10-27 03:09:34 UTC (rev 586) @@ -15,7 +15,7 @@ virtual void Close(); virtual unsigned long Tell(); virtual unsigned long Length(); - virtual bool Write( void * data, unsigned long length ); + virtual bool Write( const void * data, unsigned long length ); virtual unsigned long Read( void * data, unsigned long length ); virtual bool Check(); virtual bool Eof(); Modified: Mercury2/src/MercuryFileDriverPacked.cpp =================================================================== --- Mercury2/src/MercuryFileDriverPacked.cpp 2009-10-26 22:16:58 UTC (rev 585) +++ Mercury2/src/MercuryFileDriverPacked.cpp 2009-10-27 03:09:34 UTC (rev 586) @@ -48,7 +48,7 @@ return m_size; } -bool MercuryFileObjectPacked::Write( void * data, unsigned long length ) +bool MercuryFileObjectPacked::Write( const void * data, unsigned long length ) { //First make sure we won't over-write good data. if ( length >= ( m_size - m_location ) ) Modified: Mercury2/src/MercuryFileDriverPacked.h =================================================================== --- Mercury2/src/MercuryFileDriverPacked.h 2009-10-26 22:16:58 UTC (rev 585) +++ Mercury2/src/MercuryFileDriverPacked.h 2009-10-27 03:09:34 UTC (rev 586) @@ -14,7 +14,7 @@ virtual void Close(); virtual unsigned long Tell(); virtual unsigned long Length(); - virtual bool Write( void * data, unsigned long length ); + virtual bool Write( const void * data, unsigned long length ); virtual unsigned long Read( void * data, unsigned long length ); virtual bool Check(); virtual bool Eof(); Modified: Mercury2/src/MercuryFileDriverZipped.cpp =================================================================== --- Mercury2/src/MercuryFileDriverZipped.cpp 2009-10-26 22:16:58 UTC (rev 585) +++ Mercury2/src/MercuryFileDriverZipped.cpp 2009-10-27 03:09:34 UTC (rev 586) @@ -121,7 +121,7 @@ return m_size; } -bool MercuryFileObjectZipped::Write( void * data, unsigned long length ) +bool MercuryFileObjectZipped::Write( const void * data, unsigned long length ) { //You cannot write to a zipped file in the store form. return false; Modified: Mercury2/src/MercuryFileDriverZipped.h =================================================================== --- Mercury2/src/MercuryFileDriverZipped.h 2009-10-26 22:16:58 UTC (rev 585) +++ Mercury2/src/MercuryFileDriverZipped.h 2009-10-27 03:09:34 UTC (rev 586) @@ -15,7 +15,7 @@ virtual void Close(); virtual unsigned long Tell(); virtual unsigned long Length(); - virtual bool Write( void * data, unsigned long length ); + virtual bool Write( const void * data, unsigned long length ); virtual unsigned long Read( void * data, unsigned long length ); virtual bool Check(); virtual bool Eof(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |