diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-07-15 02:01:24 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-07-15 02:01:24 +0300 |
| commit | ebbac0bbb533ed201fedaa3c80feacc7edd142b9 (patch) | |
| tree | dea1ed43ec8741b68130949b2262875ffb80698a | |
| parent | 48ad19e4d495f8073ac5989c70e99e41e78b1b6c (diff) | |
| parent | 46b5b62781c8d0a50c3786417f7bad4c2c0f9a39 (diff) | |
Merge PR #2420: Murmur: use aiUdpFlag.load() in comparisons to fix Qt <5.2 build.
| -rw-r--r-- | src/murmur/MurmurGRPCImpl.cpp | 2 | ||||
| -rw-r--r-- | src/murmur/MurmurIce.cpp | 2 | ||||
| -rw-r--r-- | src/murmur/Server.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp index e16afa5db..3803634ed 100644 --- a/src/murmur/MurmurGRPCImpl.cpp +++ b/src/murmur/MurmurGRPCImpl.cpp @@ -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()); } diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index 85b2cb883..116143986 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -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; diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 7ce537cac..1227dcc8f 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -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); |