Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1040)

Unified Diff: webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc
diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc b/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc
index e02f0c5cb40934fa69b19212a3792bdfae25d293..180b26ef4243068d3aadd40099db1594476fae8e 100644
--- a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc
+++ b/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc
@@ -37,17 +37,14 @@ bool UdpSocketWrapper::_initiated = false;
#endif
UdpSocketWrapper::UdpSocketWrapper()
- : _wantsIncoming(false),
- _deleteEvent(NULL)
-{
-}
+ : _wantsIncoming(false), _deleteEvent(nullptr) {}
UdpSocketWrapper::~UdpSocketWrapper()
{
if(_deleteEvent)
{
_deleteEvent->Set();
- _deleteEvent = NULL;
+ _deleteEvent = nullptr;
}
}
@@ -55,7 +52,7 @@ void UdpSocketWrapper::SetEventToNull()
{
if (_deleteEvent)
{
- _deleteEvent = NULL;
+ _deleteEvent = nullptr;
}
}
@@ -87,7 +84,7 @@ UdpSocketWrapper* UdpSocketWrapper::CreateSocket(const int32_t id,
"UdpSocketWrapper::CreateSocket failed to initialize sockets\
WSAStartup error:%d",
err);
- return NULL;
+ return nullptr;
}
_initiated = true;
@@ -115,21 +112,17 @@ UdpSocketWrapper* UdpSocketWrapper::CreateSocket(const int32_t id,
id,
"UdpSocketWrapper::CreateSocket failed to initialize socket");
delete s;
- s = NULL;
+ s = nullptr;
}
}
#endif
if (s)
{
- s->_deleteEvent = NULL;
- if (!s->SetCallback(obj, cb))
- {
- WEBRTC_TRACE(
- kTraceError,
- kTraceTransport,
- id,
- "UdpSocketWrapper::CreateSocket failed to ser callback");
- return(NULL);
+ s->_deleteEvent = nullptr;
+ if (!s->SetCallback(obj, cb)) {
+ WEBRTC_TRACE(kTraceError, kTraceTransport, id,
+ "UdpSocketWrapper::CreateSocket failed to ser callback");
+ return (nullptr);
}
}
return s;

Powered by Google App Engine
This is Rietveld 408576698