From f1fd9d0c5ce77d706f64c3dcba5a10ee886bd5e9 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Sat, 24 Aug 2013 01:02:36 +0000 Subject: [PATCH] Fix compilation on windows after libjingle updated. 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 --- talk/p2p/base/p2ptransportchannel_unittest.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/talk/p2p/base/p2ptransportchannel_unittest.cc b/talk/p2p/base/p2ptransportchannel_unittest.cc index a731b8dbc9..e86658a903 100644 --- a/talk/p2p/base/p2ptransportchannel_unittest.cc +++ b/talk/p2p/base/p2ptransportchannel_unittest.cc @@ -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();