From c420a86f4c407d41876afe5b7d47b8d060e18b68 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Mon, 2 Feb 2015 10:36:30 +0000 Subject: [PATCH] Change name for local CriticalSectionScoped variable Tools were complaining about (harmless) shadowing of variable names. This is a follow-up to https://webrtc-codereview.appspot.com/41659004/#msg8 BUG=3926 TBR=kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/37099004 Cr-Commit-Position: refs/heads/master@{#8225} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8225 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_coding/codecs/isac/audio_encoder_isac_t_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h index b45fb265fd..17e533fe48 100644 --- a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h +++ b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h @@ -191,7 +191,7 @@ bool AudioEncoderDecoderIsacT::EncodeInternal(uint32_t rtp_timestamp, size_t max_encoded_bytes, uint8_t* encoded, EncodedInfo* info) { - CriticalSectionScoped cs(lock_.get()); + CriticalSectionScoped cs_lock(lock_.get()); if (!packet_in_progress_) { // Starting a new packet; remember the timestamp for later. packet_in_progress_ = true;