From 8a44259ea838f2d3a280cc7084d264df041b34ba Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 16 Dec 2011 21:24:30 +0000 Subject: [PATCH] Move static consts out of class. Still causing a gtest error on non-Win platforms. This should fix it... TBR=asapersson@webrtc.org TEST=build on Linux Review URL: http://webrtc-codereview.appspot.com/332006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1225 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/rtp_rtcp/source/rtp_sender_test.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/modules/rtp_rtcp/source/rtp_sender_test.cc b/src/modules/rtp_rtcp/source/rtp_sender_test.cc index 5dd1137bd6..e765ee1ac6 100644 --- a/src/modules/rtp_rtcp/source/rtp_sender_test.cc +++ b/src/modules/rtp_rtcp/source/rtp_sender_test.cc @@ -22,6 +22,16 @@ namespace webrtc { +namespace { +const int kId = 1; +const int kTypeLength = TRANSMISSION_TIME_OFFSET_LENGTH_IN_BYTES; +const int kPayload = 100; +const uint32_t kTimestamp = 10; +const uint16_t kSeqNum = 33; +const int kTimeOffset = 22222; +const int kMaxPacketLength = 1500; +} // namespace + class RtpSenderTest : public ::testing::Test { protected: RtpSenderTest() @@ -37,13 +47,6 @@ class RtpSenderTest : public ::testing::Test { RTPSender* rtp_sender_; const bool kMarkerBit; RTPExtensionType kType; - static const int kId = 1; - static const int kTypeLength = TRANSMISSION_TIME_OFFSET_LENGTH_IN_BYTES; - static const int kPayload = 100; - static const uint32_t kTimestamp = 10; - static const uint16_t kSeqNum = 33; - static const int kTimeOffset = 22222; - static const int kMaxPacketLength = 1500; uint8_t packet_[kMaxPacketLength]; void VerifyRTPHeaderCommon(const WebRtcRTPHeader& rtp_header) {