webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.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_receiver_impl.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_payload_registry_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a3aebf8af34f0e5d6f64729364a8f68f92d683d9..7c6287c6eace758c6e4b5b735dc18f4fe8692f44 100644

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

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

@@ -11,9 +11,8 @@

#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_

#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_

-#include <memory>

#include "webrtc/base/criticalsection.h"

+#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"

#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"

#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"

@@ -76,7 +75,7 @@

Clock* clock_;

RTPPayloadRegistry* rtp_payload_registry_;

- std::unique_ptr<RTPReceiverStrategy> rtp_media_receiver_;

+ rtc::scoped_ptr<RTPReceiverStrategy> rtp_media_receiver_;

RtpFeedback* cb_rtp_feedback_;