diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-10-26 22:31:53 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-10-26 22:31:53 +0300 |
| commit | 2e6625b191874b3dd8af5bed15bd78f559e2005a (patch) | |
| tree | 19dcbfc8ff5048228e64116ab91b1a833cf454ca /src/murmur/MurmurGRPCImpl.cpp | |
| parent | 2e08433453d84ae8f22c4546c292e627e6a12f68 (diff) | |
Murmur: replace all QAtomicInt loads with new QAtomicIntLoad compatibility function.
By using our new portable QAtomicIntLoad function, we ensure compatibility
with both Qt 4 and Qt 5.
Fixes mumble-voip/mumble#2586
Diffstat (limited to 'src/murmur/MurmurGRPCImpl.cpp')
| -rw-r--r-- | src/murmur/MurmurGRPCImpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp index 3803634ed..27e0509ff 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.load() == 0); + ru->set_tcp_only(QAtomicIntLoad(su->aiUdpFlag) == 0); ru->set_address(su->haAddress.toStdString()); } |