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

Side by Side Diff: webrtc/voice_engine/test/channel_transport/udp_socket_posix.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 20 matching lines...) Expand all
31 : _id(id), 31 : _id(id),
32 _closeBlockingCompletedCond(true, false), 32 _closeBlockingCompletedCond(true, false),
33 _readyForDeletionCond(true, false) 33 _readyForDeletionCond(true, false)
34 { 34 {
35 WEBRTC_TRACE(kTraceMemory, kTraceTransport, id, 35 WEBRTC_TRACE(kTraceMemory, kTraceTransport, id,
36 "UdpSocketPosix::UdpSocketPosix()"); 36 "UdpSocketPosix::UdpSocketPosix()");
37 37
38 _wantsIncoming = false; 38 _wantsIncoming = false;
39 _mgr = mgr; 39 _mgr = mgr;
40 40
41 _obj = NULL; 41 _obj = nullptr;
42 _incomingCb = NULL; 42 _incomingCb = nullptr;
43 _readyForDeletion = false; 43 _readyForDeletion = false;
44 _closeBlockingActive = false; 44 _closeBlockingActive = false;
45 _closeBlockingCompleted = false; 45 _closeBlockingCompleted = false;
46 if(ipV6Enable) 46 if(ipV6Enable)
47 { 47 {
48 _socket = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); 48 _socket = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
49 } 49 }
50 else { 50 else {
51 _socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); 51 _socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
52 } 52 }
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 WEBRTC_TRACE(kTraceDebug, kTraceTransport, _id, 262 WEBRTC_TRACE(kTraceDebug, kTraceTransport, _id,
263 "calling UdpSocketManager::RemoveSocket()..."); 263 "calling UdpSocketManager::RemoveSocket()...");
264 _mgr->RemoveSocket(this); 264 _mgr->RemoveSocket(this);
265 // After this, the socket should may be or will be as deleted. Return 265 // After this, the socket should may be or will be as deleted. Return
266 // immediately. 266 // immediately.
267 return true; 267 return true;
268 } 268 }
269 269
270 } // namespace test 270 } // namespace test
271 } // namespace webrtc 271 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698