Tidy up some integer conversion warnings

This commit is contained in:
Vinnie Falco
2017-06-17 13:04:01 -07:00
parent 9be141a1e0
commit 30e6426db5
4 changed files with 5 additions and 3 deletions

View File

@@ -3,6 +3,7 @@ Version 61:
* Remove Spirit dependency
* Use generic_cateogry for errno
* Reorganize SSL examples
* Tidy up some integer conversion warnings
--------------------------------------------------------------------------------

View File

@@ -204,7 +204,8 @@ get(beast::error_code& ec) ->
{
// Calculate the smaller of our buffer size,
// or the amount of unread data in the file.
auto const amount = std::min<std::uint64_t>(remain_, sizeof(buf_));
auto const amount = remain_ > sizeof(buf_) ?
sizeof(buf_) : static_cast<std::size_t>(remain_);
// Check for an empty file
if(amount == 0)

View File

@@ -51,7 +51,7 @@ public:
inline
size_type
throughput(std::chrono::duration<
double> const& elapsed, std::size_t items)
double> const& elapsed, size_type items)
{
using namespace std::chrono;
return static_cast<size_type>(

View File

@@ -209,7 +209,7 @@ private:
void
fail(std::string what, error_code ec,
int id, endpoint_type const& ep)
std::size_t id, endpoint_type const& ep)
{
if(log_)
if(ec != beast::websocket::error::closed)