webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h - Issue 1697823002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/

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/audio_coding/neteq/tools/rtp_file_source.h

Issue 1697823002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-codecs

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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/neteq/tools/rtp_analyze.cc ('k') | webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h

diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h

index 2febf68b913ff1c1779ad82905df2a6656ec0148..b02e16acdd6d96a0d0d6cace1eb42185f764655f 100644

--- a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h

+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h

@@ -12,10 +12,11 @@

#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_FILE_SOURCE_H_

#include <stdio.h>

+#include <memory>

#include <string>

#include "webrtc/base/constructormagic.h"

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

#include "webrtc/common_types.h"

#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"

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

@@ -56,8 +57,8 @@ class RtpFileSource : public PacketSource {

bool OpenFile(const std::string& file_name);

- rtc::scoped_ptr<RtpFileReader> rtp_reader_;

- rtc::scoped_ptr<RtpHeaderParser> parser_;

+ std::unique_ptr<RtpFileReader> rtp_reader_;

+ std::unique_ptr<RtpHeaderParser> parser_;

RTC_DISALLOW_COPY_AND_ASSIGN(RtpFileSource);

};