Tidy up some integer conversion warnings

2017-06-17 13:04:01 -07:00
parent 9be141a1e0
commit 30e6426db5
4 changed files with 5 additions and 3 deletions
--- a/example/server-framework/file_body.hpp
+++ b/example/server-framework/file_body.hpp
@@ -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)