| Index: webrtc/test/channel_transport/udp_socket2_win.h
|
| diff --git a/webrtc/test/channel_transport/udp_socket2_win.h b/webrtc/test/channel_transport/udp_socket2_win.h
|
| index 5d6b212b93117c5dfdc1fa37fc3f086a4a819f0f..2685013c9fb3d67a4fabeb1b28eb01a3337b74b2 100644
|
| --- a/webrtc/test/channel_transport/udp_socket2_win.h
|
| +++ b/webrtc/test/channel_transport/udp_socket2_win.h
|
| @@ -19,7 +19,7 @@
|
| #include <Ntddndis.h>
|
| #include <traffic.h>
|
|
|
| -#include "webrtc/system_wrappers/interface/atomic32.h"
|
| +#include "webrtc/base/atomicops.h"
|
| #include "webrtc/system_wrappers/interface/condition_variable_wrapper.h"
|
| #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
| #include "webrtc/system_wrappers/interface/event_wrapper.h"
|
| @@ -76,7 +76,9 @@ public:
|
| int32_t SetTOS(const int32_t serviceType) override;
|
| int32_t SetPCP(const int32_t pcp) override;
|
|
|
| - uint32_t ReceiveBuffers() override { return _receiveBuffers.Value(); }
|
| + uint32_t ReceiveBuffers() override {
|
| + return rtc::AtomicOps::AcquireLoad(&_receiveBuffers);
|
| + }
|
|
|
| protected:
|
| void IOCompleted(PerIoContext* pIOContext, uint32_t ioSize, uint32_t error);
|
| @@ -134,8 +136,8 @@ private:
|
| UdpSocket2ManagerWindows* _mgr;
|
|
|
| CriticalSectionWrapper* _pCrit;
|
| - Atomic32 _outstandingCalls;
|
| - Atomic32 _outstandingCallComplete;
|
| + volatile int _outstandingCalls;
|
| + volatile int _outstandingCallComplete;
|
| volatile bool _terminate;
|
| volatile bool _addedToMgr;
|
|
|
| @@ -170,7 +172,7 @@ private:
|
| // Holds the current pcp value. Can be -2 or 0 - 7.
|
| int _pcp;
|
|
|
| - Atomic32 _receiveBuffers;
|
| + volatile int _receiveBuffers;
|
| };
|
|
|
| } // namespace test
|
|
|