generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-02 17:50:53 +02:00
Code Issues Projects Releases Wiki Activity

fix for VC++

Browse Source
This commit is contained in:
Günter Obiltschnig 2015-04-23 17:47:37 +02:00
parent 25b446502b
commit c6cf535dd5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zip/testsuite/src/CompressTest.cpp
View File

@ -144,7 +144,7 @@ void CompressTest::createDataFile(const std::string& path, Poco::UInt64 size)
Poco::Buffer<char> buffer(MB); Poco::Buffer<char> buffer(MB);
for(int i = 0; size != 0; i++) { for(int i = 0; size != 0; i++) {
std::memset(buffer.begin(), i, buffer.size()); std::memset(buffer.begin(), i, buffer.size());
Poco::UInt64 bytesToWrite = std::min(size, buffer.size()); Poco::UInt64 bytesToWrite = std::min(size, static_cast<Poco::UInt64>(buffer.size()));
out.write(buffer.begin(), bytesToWrite); out.write(buffer.begin(), bytesToWrite);
assert( ! out.fail() ); assert( ! out.fail() );
size -= bytesToWrite; size -= bytesToWrite;

4
Zip/testsuite/src/ZipTest.cpp
View File

@ -176,10 +176,10 @@ void ZipTest::verifyDataFile(const std::string& path, Poco::UInt64 size)
{ {
std::memset(buffer1.begin(), i, buffer1.size()); std::memset(buffer1.begin(), i, buffer1.size());
std::memset(buffer2.begin(), 0, buffer2.size()); std::memset(buffer2.begin(), 0, buffer2.size());
Poco::UInt64 bytesToRead = std::min(size, buffer2.size()); Poco::UInt64 bytesToRead = std::min(size, static_cast<Poco::UInt64>(buffer2.size()));
in.read(buffer2.begin(), bytesToRead); in.read(buffer2.begin(), bytesToRead);
assert(!in.fail() ); assert(!in.fail() );
assert(std::memcmp(buffer1.begin(), buffer2.begin(), bytesToRead) == 0); assert(std::memcmp(buffer1.begin(), buffer2.begin(), static_cast<std::size_t>(bytesToRead)) == 0);
size -= bytesToRead; size -= bytesToRead;
} }
char c; char c;