From d70a78bbda3d7f1d68a109da497305ba5b8d7cfb Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Thu, 22 Jun 2017 10:19:16 -0700
Subject: [PATCH] Fix integer warnings

---
 CHANGELOG.md                    | 1 +
 example/doc/http_examples.hpp   | 9 +++++----
 test/benchmarks/buffers.cpp     | 2 +-
 test/websocket/utf8_checker.cpp | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0638e925..88617d8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Version 65:
 * Fix narrowing in ostream
 * Fix narrowing in inflate_stream
 * Fix narrowing in deflate_stream
+* Fix integer warnings
 
 --------------------------------------------------------------------------------
 
diff --git a/example/doc/http_examples.hpp b/example/doc/http_examples.hpp
index c52b8570..dca2ab1a 100644
--- a/example/doc/http_examples.hpp
+++ b/example/doc/http_examples.hpp
@@ -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
             {
diff --git a/test/benchmarks/buffers.cpp b/test/benchmarks/buffers.cpp
index 426cea34..5cc99e65 100644
--- a/test/benchmarks/buffers.cpp
+++ b/test/benchmarks/buffers.cpp
@@ -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;
diff --git a/test/websocket/utf8_checker.cpp b/test/websocket/utf8_checker.cpp
index 558d9f6d..dc01a332 100644
--- a/test/websocket/utf8_checker.cpp
+++ b/test/websocket/utf8_checker.cpp
@@ -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()));
     }