From 38d24bd68916bde3d6c0954bd05dbd06b070dc1d Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Wed, 25 Nov 2015 16:36:57 +0100 Subject: [PATCH] Compatibility with 32bit systems --- test/fuse/read/testutils/FuseReadTest.h | 2 +- test/testutils/InMemoryFile.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fuse/read/testutils/FuseReadTest.h b/test/fuse/read/testutils/FuseReadTest.h index f7d25ae4..afcb7f00 100644 --- a/test/fuse/read/testutils/FuseReadTest.h +++ b/test/fuse/read/testutils/FuseReadTest.h @@ -23,7 +23,7 @@ public: ::testing::Action ReturnSuccessfulReadRegardingSize(size_t filesize) { return ::testing::Invoke([filesize](int, void *, size_t count, off_t offset) { - size_t ableToReadCount = std::min(count, filesize - offset); + size_t ableToReadCount = std::min(count, (size_t)(filesize - offset)); return ableToReadCount; }); } diff --git a/test/testutils/InMemoryFile.cpp b/test/testutils/InMemoryFile.cpp index 65f40cd0..78df5f7d 100644 --- a/test/testutils/InMemoryFile.cpp +++ b/test/testutils/InMemoryFile.cpp @@ -9,7 +9,7 @@ InMemoryFile::~InMemoryFile() { } int InMemoryFile::read(void *buf, size_t count, off_t offset) const { - size_t realCount = std::min(count, _data.size() - offset); + size_t realCount = std::min(count, (size_t)(_data.size() - offset)); std::memcpy(buf, (uint8_t*)_data.data() + offset, realCount); return realCount; }