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

Side by Side Diff: webrtc/media/sctp/sctpdataengine.h

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: Created 4 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
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine_unittest.cc ('k') | webrtc/media/sctp/sctpdataengine.cc » ('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 (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
11 #ifndef WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_ 11 #ifndef WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_
12 #define WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_ 12 #define WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_
13 13
14 #include <errno.h> 14 #include <errno.h>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 namespace cricket { 18 namespace cricket {
19 // Some ERRNO values get re-#defined to WSA* equivalents in some talk/ 19 // Some ERRNO values get re-#defined to WSA* equivalents in some talk/
20 // headers. We save the original ones in an enum. 20 // headers. We save the original ones in an enum.
21 enum PreservedErrno { 21 enum PreservedErrno {
22 SCTP_EINPROGRESS = EINPROGRESS, 22 SCTP_EINPROGRESS = EINPROGRESS,
23 SCTP_EWOULDBLOCK = EWOULDBLOCK 23 SCTP_EWOULDBLOCK = EWOULDBLOCK
24 }; 24 };
25 } // namespace cricket 25 } // namespace cricket
26 26
27 #include "webrtc/base/buffer.h" 27 #include "webrtc/base/buffer.h"
28 #include "webrtc/base/scoped_ptr.h"
29 #include "webrtc/media/base/codec.h" 28 #include "webrtc/media/base/codec.h"
30 #include "webrtc/media/base/mediachannel.h" 29 #include "webrtc/media/base/mediachannel.h"
31 #include "webrtc/media/base/mediaengine.h" 30 #include "webrtc/media/base/mediaengine.h"
32 31
33 // Defined by "usrsctplib/usrsctp.h" 32 // Defined by "usrsctplib/usrsctp.h"
34 struct sockaddr_conn; 33 struct sockaddr_conn;
35 struct sctp_assoc_change; 34 struct sctp_assoc_change;
36 struct sctp_stream_reset_event; 35 struct sctp_stream_reset_event;
37 // Defined by <sys/socket.h> 36 // Defined by <sys/socket.h>
38 struct socket; 37 struct socket;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 StreamSet queued_reset_streams_; 229 StreamSet queued_reset_streams_;
231 StreamSet sent_reset_streams_; 230 StreamSet sent_reset_streams_;
232 231
233 // A human-readable name for debugging messages. 232 // A human-readable name for debugging messages.
234 std::string debug_name_; 233 std::string debug_name_;
235 }; 234 };
236 235
237 } // namespace cricket 236 } // namespace cricket
238 237
239 #endif // WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_ 238 #endif // WEBRTC_MEDIA_SCTP_SCTPDATAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine_unittest.cc ('k') | webrtc/media/sctp/sctpdataengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698