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

To use the channel_transport on the iOS platform, some #if directives are changed.

Browse Source 
R=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4759 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sjlee@webrtc.org 2013-09-17 05:14:32 +00:00
parent 15e979b571
commit c3e51acb30
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/test/channel_transport/channel_transport.cc
View File

@ -12,7 +12,7 @@
#include <stdio.h> #include <stdio.h>
#ifndef WEBRTC_ANDROID #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS)
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#endif #endif
#include "webrtc/test/channel_transport/udp_transport.h" #include "webrtc/test/channel_transport/udp_transport.h"
@ -20,7 +20,7 @@
#include "webrtc/video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
#include "webrtc/voice_engine/include/voe_network.h" #include "webrtc/voice_engine/include/voe_network.h"
#ifdef WEBRTC_ANDROID #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>
#endif #endif
@ -36,7 +36,7 @@ VoiceChannelTransport::VoiceChannelTransport(VoENetwork* voe_network,
socket_transport_ = UdpTransport::Create(channel, socket_threads); socket_transport_ = UdpTransport::Create(channel, socket_threads);
int registered = voe_network_->RegisterExternalTransport(channel, int registered = voe_network_->RegisterExternalTransport(channel,
*socket_transport_); *socket_transport_);
#ifndef WEBRTC_ANDROID #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS)
EXPECT_EQ(0, registered); EXPECT_EQ(0, registered);
#else #else
assert(registered == 0); assert(registered == 0);
@ -88,7 +88,7 @@ VideoChannelTransport::VideoChannelTransport(ViENetwork* vie_network,
socket_transport_ = UdpTransport::Create(channel, socket_threads); socket_transport_ = UdpTransport::Create(channel, socket_threads);
int registered = vie_network_->RegisterSendTransport(channel, int registered = vie_network_->RegisterSendTransport(channel,
*socket_transport_); *socket_transport_);
#ifndef WEBRTC_ANDROID #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS)
EXPECT_EQ(0, registered); EXPECT_EQ(0, registered);
#else #else
assert(registered == 0); assert(registered == 0);