generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation on windows after libjingle updated.

Browse Source 
For some reason MSVC doesn't use implicit char[]->std::string 
conversion when comparing char[] and std::string in EXPECT_EQ.

R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2104004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4611 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org 2013-08-24 01:02:36 +00:00
parent 492e315400
commit f1fd9d0c5c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
talk/p2p/base/p2ptransportchannel_unittest.cc
View File

@ -1416,10 +1416,14 @@ TEST_F(P2PTransportChannelTest, TestSlowSignalingAsIce) {
ep2_ch1()->writable(),
1000);
EXPECT_EQ(cricket::PRFLX_PORT_TYPE, RemoteCandidate(ep1_ch1())->type());
EXPECT_EQ(cricket::LOCAL_PORT_TYPE, LocalCandidate(ep1_ch1())->type());
EXPECT_EQ(cricket::LOCAL_PORT_TYPE, RemoteCandidate(ep2_ch1())->type());
EXPECT_EQ(cricket::LOCAL_PORT_TYPE, LocalCandidate(ep2_ch1())->type());
EXPECT_EQ(std::string(cricket::PRFLX_PORT_TYPE),
RemoteCandidate(ep1_ch1())->type());
EXPECT_EQ(std::string(cricket::LOCAL_PORT_TYPE),
LocalCandidate(ep1_ch1())->type());
EXPECT_EQ(std::string(cricket::LOCAL_PORT_TYPE),
RemoteCandidate(ep2_ch1())->type());
EXPECT_EQ(std::string(cricket::LOCAL_PORT_TYPE),
LocalCandidate(ep2_ch1())->type());
TestSendRecv(1);
DestroyChannels();