summaryrefslogtreecommitdiff
path: root/shared/serialize.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:09:45 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:09:45 +0200
commit88c8801298cbf6fec9cdce254c7b3cb9e066a421 (patch)
tree35a35acf48eb227bac30abc8f87ea9b1c3c57b68 /shared/serialize.cpp
parent3.12 (diff)
downloadFreeFileSync-88c8801298cbf6fec9cdce254c7b3cb9e066a421.tar.gz
FreeFileSync-88c8801298cbf6fec9cdce254c7b3cb9e066a421.tar.bz2
FreeFileSync-88c8801298cbf6fec9cdce254c7b3cb9e066a421.zip
3.13
Diffstat (limited to 'shared/serialize.cpp')
-rw-r--r--shared/serialize.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/shared/serialize.cpp b/shared/serialize.cpp
index f5765d3d..f71207be 100644
--- a/shared/serialize.cpp
+++ b/shared/serialize.cpp
@@ -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) *
// **************************************************************************
//
#include "serialize.h"
@@ -13,13 +13,13 @@ using namespace util;
void ReadInputStream::throwReadError() const //throw FileError()
{
throw ffs3::FileError(wxString(_("Error reading from synchronization database:")) + wxT(" \n") +
- wxT("\"") + errorObjName_ + wxT("\""));
+ wxT("\"") + errorObjName_ + wxT("\""));
}
ReadInputStream::CharArray ReadInputStream::readArrayC() const
{
- const size_t byteCount = readNumberC<size_t>();
+ const boost::uint32_t byteCount = readNumberC<boost::uint32_t>();
CharArray buffer(new std::vector<char>(byteCount));
if (byteCount > 0)
{
@@ -36,13 +36,13 @@ ReadInputStream::CharArray ReadInputStream::readArrayC() const
void WriteOutputStream::throwWriteError() const //throw FileError()
{
throw ffs3::FileError(wxString(_("Error writing to synchronization database:")) + wxT(" \n") +
- wxT("\"") + errorObjName_ + wxT("\""));
+ wxT("\"") + errorObjName_ + wxT("\""));
}
void WriteOutputStream::writeArrayC(const std::vector<char>& buffer) const
{
- writeNumberC<size_t>(buffer.size());
+ writeNumberC<boost::uint32_t>(static_cast<boost::uint32_t>(buffer.size()));
if (buffer.size() > 0)
{
stream_.Write(&buffer[0], buffer.size());
bgstack15