diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:09:45 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:09:45 +0200 |
| commit | 88c8801298cbf6fec9cdce254c7b3cb9e066a421 (patch) | |
| tree | 35a35acf48eb227bac30abc8f87ea9b1c3c57b68 /shared/serialize.h | |
| parent | 3.12 (diff) | |
| download | FreeFileSync-88c8801298cbf6fec9cdce254c7b3cb9e066a421.tar.gz FreeFileSync-88c8801298cbf6fec9cdce254c7b3cb9e066a421.tar.bz2 FreeFileSync-88c8801298cbf6fec9cdce254c7b3cb9e066a421.zip | |
3.13
Diffstat (limited to 'shared/serialize.h')
| -rw-r--r-- | shared/serialize.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shared/serialize.h b/shared/serialize.h index 5f1d5fbf..8da0a449 100644 --- a/shared/serialize.h +++ b/shared/serialize.h @@ -1,7 +1,7 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) 2008-2010 ZenJu (zhnmju123 AT gmx.de) * +// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de) * // ************************************************************************** // #ifndef SERIALIZE_H_INCLUDED @@ -37,7 +37,7 @@ protected: Zstring readStringC() const; //throw FileError(), checked read operation - typedef boost::shared_ptr<std::vector<char> > CharArray; + typedef boost::shared_ptr<std::vector<char> > CharArray; //there's no guarantee std::string has a ref-counted implementation... so use this "thing" CharArray readArrayC() const; //throw FileError() void check() const; @@ -129,7 +129,7 @@ void writeNumber(wxOutputStream& stream, T number) inline Zstring readString(wxInputStream& stream) { - const size_t strLength = readNumber<size_t>(stream); + const boost::uint32_t strLength = readNumber<boost::uint32_t>(stream); if (strLength <= 1000) { Zchar buffer[1000]; @@ -148,7 +148,7 @@ Zstring readString(wxInputStream& stream) inline void writeString(wxOutputStream& stream, const Zstring& str) { - writeNumber<size_t>(stream, str.length()); + writeNumber<boost::uint32_t>(stream, static_cast<boost::uint32_t>(str.length())); stream.Write(str.c_str(), sizeof(Zchar) * str.length()); } |