| Index: webrtc/base/asynctcpsocket.cc
|
| diff --git a/webrtc/base/asynctcpsocket.cc b/webrtc/base/asynctcpsocket.cc
|
| index 0b92b388e9c03b2c9432ae6976bfb54e5b683019..658541cdde1282ca1405d7250bf69fcf7afe8f31 100644
|
| --- a/webrtc/base/asynctcpsocket.cc
|
| +++ b/webrtc/base/asynctcpsocket.cc
|
| @@ -47,11 +47,11 @@ AsyncSocket* AsyncTCPSocketBase::ConnectSocket(
|
| std::unique_ptr<rtc::AsyncSocket> owned_socket(socket);
|
| if (socket->Bind(bind_address) < 0) {
|
| LOG(LS_ERROR) << "Bind() failed with error " << socket->GetError();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| if (socket->Connect(remote_address) < 0) {
|
| LOG(LS_ERROR) << "Connect() failed with error " << socket->GetError();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return owned_socket.release();
|
| }
|
| @@ -67,7 +67,7 @@ AsyncTCPSocketBase::AsyncTCPSocketBase(AsyncSocket* socket, bool listen,
|
| inbuf_.EnsureCapacity(kMinimumRecvSize);
|
| }
|
|
|
| - RTC_DCHECK(socket_.get() != NULL);
|
| + RTC_DCHECK(socket_.get() != nullptr);
|
| socket_->SignalConnectEvent.connect(
|
| this, &AsyncTCPSocketBase::OnConnectEvent);
|
| socket_->SignalReadEvent.connect(this, &AsyncTCPSocketBase::OnReadEvent);
|
| @@ -260,7 +260,7 @@ void AsyncTCPSocketBase::OnCloseEvent(AsyncSocket* socket, int error) {
|
|
|
| // AsyncTCPSocket
|
| // Binds and connects |socket| and creates AsyncTCPSocket for
|
| -// it. Takes ownership of |socket|. Returns NULL if bind() or
|
| +// it. Takes ownership of |socket|. Returns null if bind() or
|
| // connect() fail (|socket| is destroyed in that case).
|
| AsyncTCPSocket* AsyncTCPSocket::Create(
|
| AsyncSocket* socket,
|
|
|