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

Side by Side Diff: webrtc/base/testechoserver.h

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « webrtc/base/testclient_unittest.cc ('k') | webrtc/base/testutils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 25 matching lines...) Expand all
36 for (ClientList::iterator it = client_sockets_.begin(); 36 for (ClientList::iterator it = client_sockets_.begin();
37 it != client_sockets_.end(); ++it) { 37 it != client_sockets_.end(); ++it) {
38 delete *it; 38 delete *it;
39 } 39 }
40 } 40 }
41 41
42 SocketAddress address() const { return server_socket_->GetLocalAddress(); } 42 SocketAddress address() const { return server_socket_->GetLocalAddress(); }
43 43
44 private: 44 private:
45 void OnAccept(AsyncSocket* socket) { 45 void OnAccept(AsyncSocket* socket) {
46 AsyncSocket* raw_socket = socket->Accept(NULL); 46 AsyncSocket* raw_socket = socket->Accept(nullptr);
47 if (raw_socket) { 47 if (raw_socket) {
48 AsyncTCPSocket* packet_socket = new AsyncTCPSocket(raw_socket, false); 48 AsyncTCPSocket* packet_socket = new AsyncTCPSocket(raw_socket, false);
49 packet_socket->SignalReadPacket.connect(this, &TestEchoServer::OnPacket); 49 packet_socket->SignalReadPacket.connect(this, &TestEchoServer::OnPacket);
50 packet_socket->SignalClose.connect(this, &TestEchoServer::OnClose); 50 packet_socket->SignalClose.connect(this, &TestEchoServer::OnClose);
51 client_sockets_.push_back(packet_socket); 51 client_sockets_.push_back(packet_socket);
52 } 52 }
53 } 53 }
54 void OnPacket(AsyncPacketSocket* socket, const char* buf, size_t size, 54 void OnPacket(AsyncPacketSocket* socket, const char* buf, size_t size,
55 const SocketAddress& remote_addr, 55 const SocketAddress& remote_addr,
56 const PacketTime& packet_time) { 56 const PacketTime& packet_time) {
57 rtc::PacketOptions options; 57 rtc::PacketOptions options;
58 socket->Send(buf, size, options); 58 socket->Send(buf, size, options);
59 } 59 }
60 void OnClose(AsyncPacketSocket* socket, int err) { 60 void OnClose(AsyncPacketSocket* socket, int err) {
61 ClientList::iterator it = 61 ClientList::iterator it =
62 std::find(client_sockets_.begin(), client_sockets_.end(), socket); 62 std::find(client_sockets_.begin(), client_sockets_.end(), socket);
63 client_sockets_.erase(it); 63 client_sockets_.erase(it);
64 Thread::Current()->Dispose(socket); 64 Thread::Current()->Dispose(socket);
65 } 65 }
66 66
67 typedef std::list<AsyncTCPSocket*> ClientList; 67 typedef std::list<AsyncTCPSocket*> ClientList;
68 std::unique_ptr<AsyncSocket> server_socket_; 68 std::unique_ptr<AsyncSocket> server_socket_;
69 ClientList client_sockets_; 69 ClientList client_sockets_;
70 RTC_DISALLOW_COPY_AND_ASSIGN(TestEchoServer); 70 RTC_DISALLOW_COPY_AND_ASSIGN(TestEchoServer);
71 }; 71 };
72 72
73 } // namespace rtc 73 } // namespace rtc
74 74
75 #endif // WEBRTC_BASE_TESTECHOSERVER_H_ 75 #endif // WEBRTC_BASE_TESTECHOSERVER_H_
OLDNEW
« no previous file with comments | « webrtc/base/testclient_unittest.cc ('k') | webrtc/base/testutils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698