diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-25 23:10:28 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-25 23:10:28 +0000 |
| commit | ba47616ee5a8d8a4d94e160b64b79a56845e291b (patch) | |
| tree | 1b7c6445147e8d271e3bf09b381d69d800f2dd01 /voice_engine/channel.cc | |
| parent | b10fcf5bca8208c5330acad5122c80a17e8226dd (diff) | |
| download | webrtc-ba47616ee5a8d8a4d94e160b64b79a56845e291b.tar.gz | |
Replace scoped_array<T> with scoped_ptr<T[]>.
scoped_array is deprecated. This was done using a Chromium clang tool:
http://src.chromium.org/viewvc/chrome/trunk/src/tools/clang/rewrite_scoped_ar...
except for the few not-built-on-Linux files which were updated manually.
TESTED=trybots
BUG=2515
R=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12429004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5985 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/channel.cc')
| -rw-r--r-- | voice_engine/channel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc index 5f6de0e3..b3c53f85 100644 --- a/voice_engine/channel.cc +++ b/voice_engine/channel.cc @@ -4279,7 +4279,7 @@ Channel::GetRtpRtcp(RtpRtcp** rtpRtcpModule, RtpReceiver** rtp_receiver) const int32_t Channel::MixOrReplaceAudioWithFile(int mixingFrequency) { - scoped_array<int16_t> fileBuffer(new int16_t[640]); + scoped_ptr<int16_t[]> fileBuffer(new int16_t[640]); int fileSamples(0); { @@ -4349,7 +4349,7 @@ Channel::MixAudioWithFile(AudioFrame& audioFrame, { assert(mixingFrequency <= 32000); - scoped_array<int16_t> fileBuffer(new int16_t[640]); + scoped_ptr<int16_t[]> fileBuffer(new int16_t[640]); int fileSamples(0); { |