mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2420: Murmur: use aiUdpFlag.load() in comparisons to fix Qt <5.2 build.

Browse Source
This commit is contained in:
Mikkel Krautz 2016-07-15 01:01:24 +02:00
commit ebbac0bbb5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/murmur/MurmurGRPCImpl.cpp
View File

@ -254,7 +254,7 @@ void ToRPC(const ::Server *srv, const ::User *u, ::MurmurRPC::User *ru) {
ru->set_udp_ping_msecs(su->dUDPPingAvg);
ru->set_tcp_ping_msecs(su->dTCPPingAvg);
ru->set_tcp_only(su->aiUdpFlag == 0);
ru->set_tcp_only(su->aiUdpFlag.load() == 0);
ru->set_address(su->haAddress.toStdString());
}

2
src/murmur/MurmurIce.cpp
View File

@ -72,7 +72,7 @@ static void userToUser(const ::User *p, Murmur::User &mp) {
mp.udpPing = u->dUDPPingAvg;
mp.tcpPing = u->dTCPPingAvg;
mp.tcponly = u->aiUdpFlag == 0;
mp.tcponly = u->aiUdpFlag.load() == 0;
::Murmur::NetAddress addr(16, 0);
const Q_IPV6ADDR &a = u->haAddress.qip6;

2
src/murmur/Server.cpp
View File

@ -894,7 +894,7 @@ bool Server::checkDecrypt(ServerUser *u, const char *encrypt, char *plain, unsig
}
void Server::sendMessage(ServerUser *u, const char *data, int len, QByteArray &cache, bool force) {
if ((u->aiUdpFlag == 1 || force) && (u->sUdpSocket != INVALID_SOCKET)) {
if ((u->aiUdpFlag.load() == 1 || force) && (u->sUdpSocket != INVALID_SOCKET)) {
#if defined(__LP64__)
STACKVAR(char, ebuffer, len+4+16);
char *buffer = reinterpret_cast<char *>(((reinterpret_cast<quint64>(ebuffer) + 8) & ~7) + 4);