ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer warnings in 64-bit Windows build

Browse Source
This commit is contained in:
Vinnie Falco
2016-08-26 07:54:20 -04:00
parent c15751ced6
commit 19dd983d2b
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/beast/core/detail/base64.hpp
View File

@@ -124,7 +124,7 @@ template <class = void>
std::string
base64_decode(std::string const& data)
{
int in_len = data.size();
auto in_len = data.size();
unsigned char c3[3], c4[4];
int i = 0;
int j = 0;

18
include/beast/websocket/detail/mask.hpp
View File

@@ -113,7 +113,7 @@ mask_inplace_general(
{
using boost::asio::buffer_cast;
using boost::asio::buffer_size;
auto n = buffer_size(b);
auto const n = buffer_size(b);
auto p = buffer_cast<std::uint8_t*>(b);
for(auto i = n / sizeof(key); i; --i)
{
@@ -122,13 +122,14 @@ mask_inplace_general(
*p ^= (key >>16); ++p;
*p ^= (key >>24); ++p;
}
n %= sizeof(key);
switch(n)
auto const m =
static_cast<std::uint8_t>(n % sizeof(key));
switch(m)
{
case 3: p[2] ^= (key >>16);
case 2: p[1] ^= (key >> 8);
case 1: p[0] ^= key;
key = ror(key, n*8);
key = ror(key, m*8);
default:
break;
}
@@ -144,7 +145,7 @@ mask_inplace_general(
{
using boost::asio::buffer_cast;
using boost::asio::buffer_size;
auto n = buffer_size(b);
auto const n = buffer_size(b);
auto p = buffer_cast<std::uint8_t*>(b);
for(auto i = n / sizeof(key); i; --i)
{
@@ -157,8 +158,9 @@ mask_inplace_general(
*p ^= (key >>48); ++p;
*p ^= (key >>56); ++p;
}
n %= sizeof(key);
switch(n)
auto const m =
static_cast<std::uint8_t>(n % sizeof(key));
switch(m)
{
case 7: p[6] ^= (key >>16);
case 6: p[5] ^= (key >> 8);
@@ -167,7 +169,7 @@ mask_inplace_general(
case 3: p[2] ^= (key >>16);
case 2: p[1] ^= (key >> 8);
case 1: p[0] ^= key;
key = ror(key, n*8);
key = ror(key, m*8);
default:
break;
}