Index: webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc |
diff --git a/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc b/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc |
index 5258fdce9c8c1f5e2860616895cdf349194908cd..3c73f23e2fff1ef8b01393281e098fe6f6944ebc 100644 |
--- a/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc |
+++ b/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc |
@@ -287,11 +287,12 @@ TEST(AudioMixer, ParticipantNumberOfChannels) { |
ResetFrame(participant.fake_frame()); |
EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true)); |
- for (size_t number_of_channels : {1, 2}) { |
+ for (int number_of_channels : {1, 2}) { |
EXPECT_CALL(participant, GetAudioFrameWithMuted(_, kDefaultSampleRateHz)) |
.Times(Exactly(1)); |
mixer->Mix(kDefaultSampleRateHz, number_of_channels, &frame_for_mixing); |
- EXPECT_EQ(number_of_channels, frame_for_mixing.num_channels_); |
+ EXPECT_EQ(static_cast<size_t>(number_of_channels), |
ossu
2016/09/05 12:02:54
I believe you should be able to use one of int or
|
+ frame_for_mixing.num_channels_); |
} |
} |