Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: webrtc/common_audio/resampler/resampler.cc

Issue 2719733002: Replace NULL with nullptr or null in webrtc/audio/ and common_audio/. (Closed)
Patch Set: Fixing test. Created 3 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/common_audio/fir_filter.cc ('k') | webrtc/common_audio/resampler/sinc_resampler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/common_audio/resampler/resampler.cc
diff --git a/webrtc/common_audio/resampler/resampler.cc b/webrtc/common_audio/resampler/resampler.cc
index 7c690fc47a2bd553afa229c8f2eb426011f699ee..c91a5de9ce4be68b190ea21e08db8a50f4c0448a 100644
--- a/webrtc/common_audio/resampler/resampler.cc
+++ b/webrtc/common_audio/resampler/resampler.cc
@@ -101,37 +101,37 @@ int Resampler::Reset(int inFreq, int outFreq, size_t num_channels)
if (state1_)
{
free(state1_);
- state1_ = NULL;
+ state1_ = nullptr;
}
if (state2_)
{
free(state2_);
- state2_ = NULL;
+ state2_ = nullptr;
}
if (state3_)
{
free(state3_);
- state3_ = NULL;
+ state3_ = nullptr;
}
if (in_buffer_)
{
free(in_buffer_);
- in_buffer_ = NULL;
+ in_buffer_ = nullptr;
}
if (out_buffer_)
{
free(out_buffer_);
- out_buffer_ = NULL;
+ out_buffer_ = nullptr;
}
if (slave_left_)
{
delete slave_left_;
- slave_left_ = NULL;
+ slave_left_ = nullptr;
}
if (slave_right_)
{
delete slave_right_;
- slave_right_ = NULL;
+ slave_right_ = nullptr;
}
in_buffer_size_ = 0;
« no previous file with comments | « webrtc/common_audio/fir_filter.cc ('k') | webrtc/common_audio/resampler/sinc_resampler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698