From 9328f39a3eeba25b3af773a9533d433398b90867 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 3 Sep 2014 23:05:07 +0000 Subject: [PATCH] cast return values in uint16_t RTPFile::Read() to uint16_t to avoid compile error BUG=3663 TESTED=ninja local build on windows. R=andrew@webrtc.org, kwiberg@webrtc.org, thorcarpenter@google.com Review URL: https://webrtc-codereview.appspot.com/16229004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7049 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_coding/main/test/RTPFile.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webrtc/modules/audio_coding/main/test/RTPFile.cc b/webrtc/modules/audio_coding/main/test/RTPFile.cc index b886bde0b..5c0446525 100644 --- a/webrtc/modules/audio_coding/main/test/RTPFile.cc +++ b/webrtc/modules/audio_coding/main/test/RTPFile.cc @@ -231,13 +231,13 @@ uint16_t RTPFile::Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData, EXPECT_EQ(lengthBytes, plen + 8); if (plen == 0) { - return 0; + return static_cast(0); } if (payloadSize < (lengthBytes - 20)) { - return 0; + return static_cast(0); } if (lengthBytes < 20) { - return 0; + return static_cast(0); } lengthBytes -= 20; EXPECT_EQ(lengthBytes, fread(payloadData, 1, lengthBytes, _rtpFile));