From 1d50ee44fd53e228d40db2d6aa2f0300b736c550 Mon Sep 17 00:00:00 2001 From: kwiberg Date: Thu, 17 Mar 2016 22:54:44 -0700 Subject: [PATCH] Stop using some scoped_ptr features that unique_ptr doesn't have No operator== that accepts one unique_ptr and one T*. No implicit conversion to bool. No rtc_make_scoped_ptr function. BUG=webrtc:5520 Review URL: https://codereview.webrtc.org/1803833002 Cr-Commit-Position: refs/heads/master@{#12048} --- webrtc/base/asyncudpsocket.cc | 1 - webrtc/base/httpserver.cc | 1 - webrtc/base/optional_unittest.cc | 2 +- webrtc/p2p/base/dtlstransportchannel.cc | 2 +- webrtc/p2p/base/tcpport.cc | 8 ++++---- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/webrtc/base/asyncudpsocket.cc b/webrtc/base/asyncudpsocket.cc index 51a8fa0af0..4e80733084 100644 --- a/webrtc/base/asyncudpsocket.cc +++ b/webrtc/base/asyncudpsocket.cc @@ -37,7 +37,6 @@ AsyncUDPSocket* AsyncUDPSocket::Create(SocketFactory* factory, AsyncUDPSocket::AsyncUDPSocket(AsyncSocket* socket) : socket_(socket) { - ASSERT(socket_); size_ = BUF_SIZE; buf_ = new char[size_]; diff --git a/webrtc/base/httpserver.cc b/webrtc/base/httpserver.cc index 0d22584226..1d3fcc60a5 100644 --- a/webrtc/base/httpserver.cc +++ b/webrtc/base/httpserver.cc @@ -268,7 +268,6 @@ void HttpListenServer::StopListening() { void HttpListenServer::OnReadEvent(AsyncSocket* socket) { ASSERT(socket == listener_.get()); - ASSERT(listener_); AsyncSocket* incoming = listener_->Accept(NULL); if (incoming) { StreamInterface* stream = new SocketStream(incoming); diff --git a/webrtc/base/optional_unittest.cc b/webrtc/base/optional_unittest.cc index 89e538b7d5..8ddbebadb9 100644 --- a/webrtc/base/optional_unittest.cc +++ b/webrtc/base/optional_unittest.cc @@ -65,7 +65,7 @@ class Logger { void Foo() { Log("Foo()"); } void Foo() const { Log("Foo() const"); } static rtc::scoped_ptr> Setup() { - auto s = rtc_make_scoped_ptr(new std::vector); + rtc::scoped_ptr> s(new std::vector); g_log = s.get(); g_next_id = 0; return s; diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc index bbf3e5c484..33b5b6f268 100644 --- a/webrtc/p2p/base/dtlstransportchannel.cc +++ b/webrtc/p2p/base/dtlstransportchannel.cc @@ -234,7 +234,7 @@ bool DtlsTransportChannelWrapper::SetRemoteFingerprint( remote_fingerprint_value_ = std::move(remote_fingerprint_value); remote_fingerprint_algorithm_ = digest_alg; - bool reconnect = dtls_; + bool reconnect = (dtls_ != nullptr); if (!SetupDtls()) { set_dtls_state(DTLS_TRANSPORT_FAILED); diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc index cd3c9192e4..59c4f317d4 100644 --- a/webrtc/p2p/base/tcpport.cc +++ b/webrtc/p2p/base/tcpport.cc @@ -382,7 +382,7 @@ void TCPConnection::OnConnectionRequestResponse(ConnectionRequest* req, } void TCPConnection::OnConnect(rtc::AsyncPacketSocket* socket) { - ASSERT(socket == socket_); + ASSERT(socket == socket_.get()); // Do not use this connection if the socket bound to a different address than // the one we asked for. This is seen in Chrome, where TCP sockets cannot be // given a binding address, and the platform is expected to pick the @@ -412,7 +412,7 @@ void TCPConnection::OnConnect(rtc::AsyncPacketSocket* socket) { } void TCPConnection::OnClose(rtc::AsyncPacketSocket* socket, int error) { - ASSERT(socket == socket_); + ASSERT(socket == socket_.get()); LOG_J(LS_INFO, this) << "Connection closed with error " << error; // Guard against the condition where IPC socket will call OnClose for every @@ -471,12 +471,12 @@ void TCPConnection::OnReadPacket( rtc::AsyncPacketSocket* socket, const char* data, size_t size, const rtc::SocketAddress& remote_addr, const rtc::PacketTime& packet_time) { - ASSERT(socket == socket_); + ASSERT(socket == socket_.get()); Connection::OnReadPacket(data, size, packet_time); } void TCPConnection::OnReadyToSend(rtc::AsyncPacketSocket* socket) { - ASSERT(socket == socket_); + ASSERT(socket == socket_.get()); Connection::OnReadyToSend(); }