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

Side by Side Diff: webrtc/examples/relayserver/relayserver_main.cc

Issue 1937693002: Replace scoped_ptr with unique_ptr everywhere (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@unique5
Patch Set: Created 4 years, 7 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 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
11 #include <iostream> // NOLINT 11 #include <iostream> // NOLINT
12 #include <memory>
12 13
13 #include "webrtc/p2p/base/relayserver.h" 14 #include "webrtc/p2p/base/relayserver.h"
14 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/base/thread.h" 15 #include "webrtc/base/thread.h"
16 16
17 int main(int argc, char **argv) { 17 int main(int argc, char **argv) {
18 if (argc != 3) { 18 if (argc != 3) {
19 std::cerr << "usage: relayserver internal-address external-address" 19 std::cerr << "usage: relayserver internal-address external-address"
20 << std::endl; 20 << std::endl;
21 return 1; 21 return 1;
22 } 22 }
23 23
24 rtc::SocketAddress int_addr; 24 rtc::SocketAddress int_addr;
25 if (!int_addr.FromString(argv[1])) { 25 if (!int_addr.FromString(argv[1])) {
26 std::cerr << "Unable to parse IP address: " << argv[1]; 26 std::cerr << "Unable to parse IP address: " << argv[1];
27 return 1; 27 return 1;
28 } 28 }
29 29
30 rtc::SocketAddress ext_addr; 30 rtc::SocketAddress ext_addr;
31 if (!ext_addr.FromString(argv[2])) { 31 if (!ext_addr.FromString(argv[2])) {
32 std::cerr << "Unable to parse IP address: " << argv[2]; 32 std::cerr << "Unable to parse IP address: " << argv[2];
33 return 1; 33 return 1;
34 } 34 }
35 35
36 rtc::Thread *pthMain = rtc::Thread::Current(); 36 rtc::Thread *pthMain = rtc::Thread::Current();
37 37
38 rtc::scoped_ptr<rtc::AsyncUDPSocket> int_socket( 38 std::unique_ptr<rtc::AsyncUDPSocket> int_socket(
39 rtc::AsyncUDPSocket::Create(pthMain->socketserver(), int_addr)); 39 rtc::AsyncUDPSocket::Create(pthMain->socketserver(), int_addr));
40 if (!int_socket) { 40 if (!int_socket) {
41 std::cerr << "Failed to create a UDP socket bound at" 41 std::cerr << "Failed to create a UDP socket bound at"
42 << int_addr.ToString() << std::endl; 42 << int_addr.ToString() << std::endl;
43 return 1; 43 return 1;
44 } 44 }
45 45
46 rtc::scoped_ptr<rtc::AsyncUDPSocket> ext_socket( 46 std::unique_ptr<rtc::AsyncUDPSocket> ext_socket(
47 rtc::AsyncUDPSocket::Create(pthMain->socketserver(), ext_addr)); 47 rtc::AsyncUDPSocket::Create(pthMain->socketserver(), ext_addr));
48 if (!ext_socket) { 48 if (!ext_socket) {
49 std::cerr << "Failed to create a UDP socket bound at" 49 std::cerr << "Failed to create a UDP socket bound at"
50 << ext_addr.ToString() << std::endl; 50 << ext_addr.ToString() << std::endl;
51 return 1; 51 return 1;
52 } 52 }
53 53
54 cricket::RelayServer server(pthMain); 54 cricket::RelayServer server(pthMain);
55 server.AddInternalSocket(int_socket.get()); 55 server.AddInternalSocket(int_socket.get());
56 server.AddExternalSocket(ext_socket.get()); 56 server.AddExternalSocket(ext_socket.get());
57 57
58 std::cout << "Listening internally at " << int_addr.ToString() << std::endl; 58 std::cout << "Listening internally at " << int_addr.ToString() << std::endl;
59 std::cout << "Listening externally at " << ext_addr.ToString() << std::endl; 59 std::cout << "Listening externally at " << ext_addr.ToString() << std::endl;
60 60
61 pthMain->Run(); 61 pthMain->Run();
62 return 0; 62 return 0;
63 } 63 }
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/peer_connection_client.h ('k') | webrtc/media/base/videoadapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698