Merge pull request #228 from bensuperpc/change_cast
This commit is contained in:
@ -210,7 +210,7 @@ void LocalPeer::receiveConnection()
|
||||
return;
|
||||
}
|
||||
|
||||
while (socket->bytesAvailable() < (int)sizeof(quint32))
|
||||
while (socket->bytesAvailable() < static_cast<int>(sizeof(quint32)))
|
||||
{
|
||||
socket->waitForReadyRead();
|
||||
}
|
||||
|
@ -445,7 +445,7 @@ void DeviceFlow::onRefreshError(QNetworkReply::NetworkError error, QNetworkReply
|
||||
if(refreshReply) {
|
||||
refreshReply->deleteLater();
|
||||
}
|
||||
qDebug() << "DeviceFlow::onRefreshFinished: Error" << (int)error << " - " << errorString;
|
||||
qDebug() << "DeviceFlow::onRefreshFinished: Error" << static_cast<int>(error) << " - " << errorString;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -55,12 +55,12 @@ uint32_t MurmurHash2(std::ifstream&& file_stream, std::size_t buffer_size, std::
|
||||
|
||||
// Mix 4 bytes at a time into the hash
|
||||
if (index == 0)
|
||||
FourBytes_MurmurHash2((unsigned char*)&data, info);
|
||||
FourBytes_MurmurHash2(reinterpret_cast<unsigned char*>(&data), info);
|
||||
}
|
||||
} while (!file_stream.eof());
|
||||
|
||||
// Do one last bit shuffle in the hash
|
||||
FourBytes_MurmurHash2((unsigned char*)&data, info);
|
||||
FourBytes_MurmurHash2(reinterpret_cast<unsigned char*>(&data), info);
|
||||
|
||||
delete[] buffer;
|
||||
|
||||
@ -72,7 +72,7 @@ void FourBytes_MurmurHash2(const unsigned char* data, IncrementalHashInfo& prev)
|
||||
{
|
||||
if (prev.len >= 4) {
|
||||
// Not the final mix
|
||||
uint32_t k = *(uint32_t*)data;
|
||||
uint32_t k = *reinterpret_cast<const uint32_t*>(data);
|
||||
|
||||
k *= m;
|
||||
k ^= k >> r;
|
||||
|
Reference in New Issue
Block a user