Fix integer warnings

This commit is contained in:
Vinnie Falco
2017-06-22 10:19:16 -07:00
parent 6535d1734d
commit d70a78bbda
4 changed files with 8 additions and 6 deletions

View File

@ -6,6 +6,7 @@ Version 65:
* Fix narrowing in ostream
* Fix narrowing in inflate_stream
* Fix narrowing in deflate_stream
* Fix integer warnings
--------------------------------------------------------------------------------

View File

@ -706,12 +706,13 @@ read_istream(
if(is.rdbuf()->in_avail() > 0)
{
// Get a mutable buffer sequence for writing
auto const mb = buffer.prepare(is.rdbuf()->in_avail());
auto const mb = buffer.prepare(
static_cast<std::size_t>(is.rdbuf()->in_avail()));
// Now get everything we can from the istream
buffer.commit(is.readsome(
buffer.commit(static_cast<std::size_t>(is.readsome(
boost::asio::buffer_cast<char*>(mb),
boost::asio::buffer_size(mb)));
boost::asio::buffer_size(mb))));
}
else if(buffer.size() == 0)
{
@ -736,7 +737,7 @@ read_istream(
}
// Commit the characters we got to the buffer.
buffer.commit(is.gcount());
buffer.commit(static_cast<std::size_t>(is.gcount()));
}
else
{

View File

@ -71,7 +71,7 @@ public:
std::fill(
buffer_cast<char*>(buffer),
buffer_cast<char*>(buffer) +
buffer_size(buffer), 0);
buffer_size(buffer), '\0');
n += buffer_size(buffer);
}
return n;

View File

@ -49,7 +49,7 @@ public:
BEAST_EXPECT(! utf8.write(&(*it), 1));
// Invalid sequence
std::fill(buf.begin(), buf.end(), 0xFF);
std::fill(buf.begin(), buf.end(), '\xff');
BEAST_EXPECT(! utf8.write(&buf.front(), buf.size()));
}