Use static_cast instead

fix #1163

CHANGELOG.md

@@ -1,5 +1,7 @@
 Version 178:
 
+* Use static_cast instead
+
 --------------------------------------------------------------------------------
 
 Version 177:

include/boost/beast/core/buffers_to_string.hpp

@@ -49,7 +49,7 @@ buffers_to_string(ConstBufferSequence const& buffers)
     result.reserve(boost::asio::buffer_size(buffers));
     for(boost::asio::const_buffer buffer :
             detail::buffers_range(buffers))
-        result.append(reinterpret_cast<
+        result.append(static_cast<
             char const*>(buffer.data()), buffer.size());
     return result;
 }

include/boost/beast/core/detail/ostream.hpp

@@ -49,9 +49,7 @@ operator<<(std::ostream& os,
     buffers_helper<Buffers> const& v)
 {
     for(auto b : buffers_range(v.b_))
-        os.write(
+        os.write(static_cast<char const*>(b.data()), b.size());
-            reinterpret_cast<char const*>(b.data()),
-            b.size());
     return os;
 }
 
@@ -134,7 +132,7 @@ private:
         auto bs = buf_.prepare(
             read_size_or_throw(buf_, max_size));
         auto const b = buffers_front(bs);
-        auto const p = reinterpret_cast<CharT*>(b.data());
+        auto const p = static_cast<CharT*>(b.data());
         this->setp(p,
             p + b.size() / sizeof(CharT) - 1);
     }
@@ -213,7 +211,7 @@ private:
         auto bs = buf_.prepare(
             read_size_or_throw(buf_, max_size));
         auto const b = buffers_front(bs);
-        auto const p = reinterpret_cast<CharT*>(b.data());
+        auto const p = static_cast<CharT*>(b.data());
         this->setp(p,
             p + b.size() / sizeof(CharT) - 1);
     }

include/boost/beast/core/detail/sha1.hpp

@@ -248,7 +248,7 @@ void
 update(sha1_context& ctx,
     void const* message, std::size_t size) noexcept
 {
-    auto p = reinterpret_cast<
+    auto p = static_cast<
         std::uint8_t const*>(message);
     for(;;)
     {
@@ -298,7 +298,7 @@ finish(sha1_context& ctx, void* digest) noexcept
     for(std::size_t i = 0; i < sha1::DIGEST_BYTES/4; i++)
     {
         std::uint8_t* d =
-            reinterpret_cast<std::uint8_t*>(digest) + 4 * i;
+            static_cast<std::uint8_t*>(digest) + 4 * i;
         d[3] =  ctx.digest[i]        & 0xff;
         d[2] = (ctx.digest[i] >>  8) & 0xff;
         d[1] = (ctx.digest[i] >> 16) & 0xff;

include/boost/beast/core/impl/file_posix.ipp

@@ -307,7 +307,7 @@ read(void* buffer, std::size_t n, error_code& ec) const
         }
         n -= result;
         nread += result;
-        buffer = reinterpret_cast<char*>(buffer) + result;
+        buffer = static_cast<char*>(buffer) + result;
     }
     return nread;
 }
@@ -338,7 +338,7 @@ write(void const* buffer, std::size_t n, error_code& ec)
         }
         n -= result;
         nwritten += result;
-        buffer = reinterpret_cast<char const*>(buffer) + result;
+        buffer = static_cast<char const*>(buffer) + result;
     }
     return nwritten;
 }

include/boost/beast/core/impl/file_win32.ipp

@@ -311,7 +311,7 @@ read(void* buffer, std::size_t n, error_code& ec)
             return nread;
         n -= bytesRead;
         nread += bytesRead;
-        buffer = reinterpret_cast<char*>(buffer) + bytesRead;
+        buffer = static_cast<char*>(buffer) + bytesRead;
     }
     ec.assign(0, ec.category());
     return nread;
@@ -352,7 +352,7 @@ write(void const* buffer, std::size_t n, error_code& ec)
             return nwritten;
         n -= bytesWritten;
         nwritten += bytesWritten;
-        buffer = reinterpret_cast<char const*>(buffer) + bytesWritten;
+        buffer = static_cast<char const*>(buffer) + bytesWritten;
     }
     ec.assign(0, ec.category());
     return nwritten;

include/boost/beast/core/impl/flat_static_buffer.ipp

@@ -75,8 +75,7 @@ void
 flat_static_buffer_base::
 reset_impl(void* p, std::size_t n)
 {
-    begin_ =
+    begin_ = static_cast<char*>(p);
-        reinterpret_cast<char*>(p);
     in_ = begin_;
     out_ = begin_;
     last_ = begin_;

include/boost/beast/core/impl/static_buffer.ipp

@@ -24,7 +24,7 @@ namespace beast {
 inline
 static_buffer_base::
 static_buffer_base(void* p, std::size_t size)
-    : begin_(reinterpret_cast<char*>(p))
+    : begin_(static_cast<char*>(p))
     , capacity_(size)
 {
 }
@@ -131,7 +131,7 @@ void
 static_buffer_base::
 reset(void* p, std::size_t size)
 {
-    begin_ = reinterpret_cast<char*>(p);
+    begin_ = static_cast<char*>(p);
     capacity_ = size;
     in_off_ = 0;
     in_size_ = 0;

include/boost/beast/experimental/http/impl/icy_stream.ipp

@@ -129,7 +129,7 @@ buffer_shift(MutableBuffers const& out, ConstBuffers const& in)
         if(mb.size() >= cb.size())
         {
             std::memmove(
-                reinterpret_cast<char*>(
+                static_cast<char*>(
                     mb.data()) + mb.size() - cb.size(),
                 cb.data(),
                 cb.size());
@@ -143,7 +143,7 @@ buffer_shift(MutableBuffers const& out, ConstBuffers const& in)
         {
             std::memmove(
                 mb.data(),
-                reinterpret_cast<char const*>(
+                static_cast<char const*>(
                     cb.data()) + cb.size() - mb.size(),
                 mb.size());
             cb = boost::asio::const_buffer{

include/boost/beast/experimental/test/impl/stream.ipp

@@ -124,7 +124,7 @@ str() const
     if(boost::asio::buffer_size(bs) == 0)
         return {};
     auto const b = buffers_front(bs);
-    return {reinterpret_cast<char const*>(b.data()), b.size()};
+    return {static_cast<char const*>(b.data()), b.size()};
 }
 
 inline

include/boost/beast/http/buffer_body.hpp

@@ -131,7 +131,7 @@ struct buffer_body
             auto const bytes_transferred =
                 buffer_copy(boost::asio::buffer(
                     body_.data, body_.size), buffers);
-            body_.data = reinterpret_cast<char*>(
+            body_.data = static_cast<char*>(
                 body_.data) + bytes_transferred;
             body_.size -= bytes_transferred;
             if(bytes_transferred == buffer_size(buffers))

include/boost/beast/http/impl/basic_parser.ipp

@@ -132,8 +132,7 @@ put(boost::asio::const_buffer const& buffer,
 {
     BOOST_ASSERT(state_ != state::complete);
     using boost::asio::buffer_size;
-    auto p = reinterpret_cast<
+    auto p = static_cast<char const*>(buffer.data());
-        char const*>(buffer.data());
     auto n = buffer.size();
     auto const p0 = p;
     auto const p1 = p0 + n;

include/boost/beast/http/impl/write.ipp

@@ -937,7 +937,7 @@ public:
         std::size_t bytes_transferred = 0;
         for(auto b : buffers_range(buffers))
         {
-            os_.write(reinterpret_cast<char const*>(
+            os_.write(static_cast<char const*>(
                 b.data()), b.size());
             if(os_.fail())
                 return;

include/boost/beast/http/string_body.hpp

@@ -133,7 +133,7 @@ public:
             CharT* dest = &body_[size];
             for(auto b : beast::detail::buffers_range(buffers))
             {
-                Traits::copy(dest, reinterpret_cast<
+                Traits::copy(dest, static_cast<
                     CharT const*>(b.data()), b.size());
                 dest += b.size();
             }

include/boost/beast/websocket/detail/frame.hpp

@@ -30,7 +30,7 @@ inline
 std::uint16_t
 big_uint16_to_native(void const* buf)
 {
-    auto const p = reinterpret_cast<
+    auto const p = static_cast<
         std::uint8_t const*>(buf);
     return (p[0]<<8) + p[1];
 }
@@ -39,7 +39,7 @@ inline
 std::uint64_t
 big_uint64_to_native(void const* buf)
 {
-    auto const p = reinterpret_cast<
+    auto const p = static_cast<
         std::uint8_t const*>(buf);
     return
         (static_cast<std::uint64_t>(p[0])<<56) +
@@ -56,7 +56,7 @@ inline
 std::uint32_t
 little_uint32_to_native(void const* buf)
 {
-    auto const p = reinterpret_cast<
+    auto const p = static_cast<
         std::uint8_t const*>(buf);
     return
                                     p[0] +
@@ -69,7 +69,7 @@ inline
 void
 native_to_little_uint32(std::uint32_t v, void* buf)
 {
-    auto p = reinterpret_cast<std::uint8_t*>(buf);
+    auto p = static_cast<std::uint8_t*>(buf);
     p[0] =  v        & 0xff;
     p[1] = (v >>  8) & 0xff;
     p[2] = (v >> 16) & 0xff;

include/boost/beast/websocket/detail/mask.hpp

@@ -53,7 +53,7 @@ mask_inplace(boost::asio::mutable_buffer& b, prepared_key& key)
 {
     auto n = b.size();
     auto mask = key; // avoid aliasing
-    auto p = reinterpret_cast<unsigned char*>(b.data());
+    auto p = static_cast<unsigned char*>(b.data());
     while(n >= 4)
     {
         for(int i = 0; i < 4; ++i)

include/boost/beast/websocket/detail/utf8_checker.hpp

@@ -89,7 +89,7 @@ write(ConstBufferSequence const& bs)
     static_assert(boost::asio::is_const_buffer_sequence<ConstBufferSequence>::value,
         "ConstBufferSequence requirements not met");
     for(auto b : beast::detail::buffers_range(bs))
-        if(! write(reinterpret_cast<
+        if(! write(static_cast<
             std::uint8_t const*>(b.data()),
                 b.size()))
             return false;

include/boost/beast/zlib/detail/inflate_stream.hpp

@@ -264,11 +264,11 @@ inflate_stream::
 doWrite(z_params& zs, Flush flush, error_code& ec)
 {
     ranges r;
-    r.in.first = reinterpret_cast<
+    r.in.first = static_cast<
         std::uint8_t const*>(zs.next_in);
     r.in.last = r.in.first + zs.avail_in;
     r.in.next = r.in.first;
-    r.out.first = reinterpret_cast<
+    r.out.first = static_cast<
         std::uint8_t*>(zs.next_out);
     r.out.last = r.out.first + zs.avail_out;
     r.out.next = r.out.first;

test/beast/http/message_fuzz.hpp

@@ -509,7 +509,7 @@ public:
                 ++it)
             {
                 boost::asio::mutable_buffer b = *it;
-                auto p = reinterpret_cast<char*>(b.data());
+                auto p = static_cast<char*>(b.data());
                 auto n = b.size();
                 while(n--)
                     *p++ = static_cast<char>(32 + rand(26+26+10+6));
@@ -533,7 +533,7 @@ public:
                     ++it)
                 {
                     boost::asio::mutable_buffer b = *it;
-                    auto p = reinterpret_cast<char*>(b.data());
+                    auto p = static_cast<char*>(b.data());
                     auto m = b.size();
                     while(m--)
                         *p++ = static_cast<char>(32 + rand(26+26+10+6));

test/bench/buffers/bench_buffers.cpp

@@ -70,8 +70,8 @@ public:
         for(auto b : beast::detail::buffers_range(buffers))
         {
             std::fill(
-                reinterpret_cast<char*>(b.data()),
+                static_cast<char*>(b.data()),
-                reinterpret_cast<char*>(b.data()) +
+                static_cast<char*>(b.data()) +
                     b.size(), '\0');
             n += b.size();
         }

test/bench/parser/nodejs_parser.hpp

@@ -271,7 +271,7 @@ nodejs_basic_parser<Derived>::write(
     for(auto buffer : beast::detail::buffers_range(buffers))
     {
         auto const n = write(
-            reinterpret_cast<void const*>(buffer.data()),
+            static_cast<void const*>(buffer.data()),
                 buffer.size(), ec);
         if(ec)
             return 0;