webrtc/modules/rtp_rtcp/source/rtp_sender.h - Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.h

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/rtp_rtcp/source/rtp_sender.h

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h

index f9d5df68022516d7f4a7b589213d037d80b01c31..99465c67f30c3772bd60b03623470d38380880f9 100644

--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h

+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h

@@ -13,7 +13,6 @@

#include <list>

#include <map>

-#include <memory>

#include <utility>

#include <vector>

@@ -424,8 +423,8 @@

Bitrate total_bitrate_sent_;

const bool audio_configured_;

- const std::unique_ptr<RTPSenderAudio> audio_;

- const std::unique_ptr<RTPSenderVideo> video_;

+ const rtc::scoped_ptr<RTPSenderAudio> audio_;

+ const rtc::scoped_ptr<RTPSenderVideo> video_;

RtpPacketSender* const paced_sender_;

TransportSequenceNumberAllocator* const transport_sequence_number_allocator_;

« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »