From deaf685b66946d0807414b30b3515200edafdf3b Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Mon, 10 Sep 2012 13:19:08 +0000 Subject: [PATCH] Fix gcc 4.6 compilation for video_engine_unittest TEST=Manually built using gcc 4.6. Review URL: https://webrtc-codereview.appspot.com/787004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2725 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/encoder_state_feedback_unittest.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/video_engine/encoder_state_feedback_unittest.cc b/src/video_engine/encoder_state_feedback_unittest.cc index a7473d35da..3059526fa4 100644 --- a/src/video_engine/encoder_state_feedback_unittest.cc +++ b/src/video_engine/encoder_state_feedback_unittest.cc @@ -60,7 +60,7 @@ class VieKeyRequestTest : public ::testing::Test { TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) { const int ssrc = 1234; MockVieEncoder encoder(process_thread_.get()); - EXPECT_EQ(true, encoder_state_feedback_->AddEncoder(ssrc, &encoder)); + EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc, &encoder)); EXPECT_CALL(encoder, OnReceivedIntraFrameRequest(ssrc)) .Times(1); @@ -89,8 +89,8 @@ TEST_F(VieKeyRequestTest, MultipleEncoders) { const int ssrc_2 = 5678; MockVieEncoder encoder_1(process_thread_.get()); MockVieEncoder encoder_2(process_thread_.get()); - EXPECT_EQ(true, encoder_state_feedback_->AddEncoder(ssrc_1, &encoder_1)); - EXPECT_EQ(true, encoder_state_feedback_->AddEncoder(ssrc_2, &encoder_2)); + EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc_1, &encoder_1)); + EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc_2, &encoder_2)); EXPECT_CALL(encoder_1, OnReceivedIntraFrameRequest(ssrc_1)) .Times(1); @@ -134,8 +134,8 @@ TEST_F(VieKeyRequestTest, MultipleEncoders) { TEST_F(VieKeyRequestTest, AddTwiceError) { const int ssrc = 1234; MockVieEncoder encoder(process_thread_.get()); - EXPECT_EQ(true, encoder_state_feedback_->AddEncoder(ssrc, &encoder)); - EXPECT_EQ(false, encoder_state_feedback_->AddEncoder(ssrc, &encoder)); + EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc, &encoder)); + EXPECT_FALSE(encoder_state_feedback_->AddEncoder(ssrc, &encoder)); encoder_state_feedback_->RemoveEncoder(ssrc); }