Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away
BUG= R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36229004 Cr-Commit-Position: refs/heads/master@{#8517} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -13,9 +13,9 @@
|
||||
#include <vector>
|
||||
|
||||
#include "google/gflags.h"
|
||||
#include "webrtc/base/scoped_ptr.h"
|
||||
#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
|
||||
#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
|
||||
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
|
||||
|
||||
// Flag validator.
|
||||
static bool ValidatePayloadType(const char* flagname, int32_t value) {
|
||||
@ -60,7 +60,7 @@ int main(int argc, char* argv[]) {
|
||||
}
|
||||
|
||||
printf("Input file: %s\n", argv[1]);
|
||||
webrtc::scoped_ptr<webrtc::test::RtpFileSource> file_source(
|
||||
rtc::scoped_ptr<webrtc::test::RtpFileSource> file_source(
|
||||
webrtc::test::RtpFileSource::Create(argv[1]));
|
||||
assert(file_source.get());
|
||||
// Set RTP extension ID.
|
||||
@ -90,7 +90,7 @@ int main(int argc, char* argv[]) {
|
||||
}
|
||||
fprintf(out_file, "\n");
|
||||
|
||||
webrtc::scoped_ptr<webrtc::test::Packet> packet;
|
||||
rtc::scoped_ptr<webrtc::test::Packet> packet;
|
||||
while (true) {
|
||||
packet.reset(file_source->NextPacket());
|
||||
if (!packet.get()) {
|
||||
|
||||
Reference in New Issue
Block a user