From 27e0164234c916adaf0ce78e29dffe565302ef53 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Sat, 25 Nov 2006 23:38:14 +0000 Subject: I think this is a better serializer model. --- src/serializerbinary.cpp | 126 ++--------------------------------------------- 1 file changed, 4 insertions(+), 122 deletions(-) (limited to 'src/serializerbinary.cpp') diff --git a/src/serializerbinary.cpp b/src/serializerbinary.cpp index 23fb2b1..bfe3cc9 100644 --- a/src/serializerbinary.cpp +++ b/src/serializerbinary.cpp @@ -48,127 +48,9 @@ void SerializerBinary::write(const void * pData, int32_t nSize) void SerializerBinary::read(void * pData, int32_t nSize) { - fread(pData, nSize, 1, fhFile); -} - -Serializer &SerializerBinary::operator<<(bool p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(int8_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(int16_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(int32_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(int64_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(uint8_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(uint16_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(uint32_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(uint64_t p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(float p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(double p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator<<(long double p) -{ - fwrite(&p, sizeof(p), 1, fhFile); - return *this; + if( fread(pData, nSize, 1, fhFile) < 1 ) + { + throw FileException( excodeEOF, "End of file read"); + } } -Serializer &SerializerBinary::operator>>(bool &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(int8_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(int16_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(int32_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(int64_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(uint8_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(uint16_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(uint32_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(uint64_t &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(float &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(double &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -Serializer &SerializerBinary::operator>>(long double &p) -{ - fread(&p, sizeof(p), 1, fhFile); - return *this; -} -- cgit v1.2.3