webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h - Issue 1923133002: 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/include/rtp_payload_registry.h

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

Patch Set: Don't remove #include "scoped_ptr.h" from .h files 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/include/remote_ntp_time_estimator.h ('k') | webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

diff --git a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

index 6ce643496d0105179869b31fa2b1f4ea43a523d7..06ef2fc4a172c2ac5b0e5a90c71bd0e5f1d23c4c 100644

--- a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

+++ b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

@@ -12,6 +12,7 @@

#define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_

#include <map>

+#include <memory>

#include "webrtc/base/criticalsection.h"

#include "webrtc/base/scoped_ptr.h"

@@ -181,7 +182,7 @@ class RTPPayloadRegistry {

rtc::CriticalSection crit_sect_;

RtpUtility::PayloadTypeMap payload_type_map_;

- rtc::scoped_ptr<RTPPayloadStrategy> rtp_payload_strategy_;

+ std::unique_ptr<RTPPayloadStrategy> rtp_payload_strategy_;

int8_t red_payload_type_;

int8_t ulpfec_payload_type_;

int8_t incoming_payload_type_;

« no previous file with comments | « webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h ('k') | webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc » ('j') | no next file with comments »