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

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h

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

index 7a74d7ffe83b3f485a4a67fa57d25d2ff6435e85..ad6fd166f2ba539c7f2c5f1d071763bb5f2c8dfe 100644

--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h

+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h

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

#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_

#include <deque>

-#include <memory>

#include <vector>

#include "webrtc/base/constructormagic.h"

@@ -59,7 +58,7 @@

static const uint8_t kFeedbackMessageType = 15; // TODO(sprang): IANA reg?

static const uint8_t kPayloadType = 205; // RTPFB, see RFC4585.

- static std::unique_ptr<TransportFeedback> ParseFrom(const uint8_t* buffer,

+ static rtc::scoped_ptr<TransportFeedback> ParseFrom(const uint8_t* buffer,

size_t length);

protected: