diff options
author | trav90 <travawine@openmailbox.org> | 2018-03-04 15:34:58 -0600 |
---|---|---|
committer | trav90 <travawine@openmailbox.org> | 2018-03-04 15:34:58 -0600 |
commit | 28b120018135438eaff8307f3cdef921a697d47a (patch) | |
tree | bdb7931fb2d33140bc20c1e50cc977e91d8a89c1 /media/webrtc/signaling/test/mediaconduit_unittests.cpp | |
parent | 050973b503346c67f599b634983ffa579926ac4c (diff) | |
download | UXP-28b120018135438eaff8307f3cdef921a697d47a.tar UXP-28b120018135438eaff8307f3cdef921a697d47a.tar.gz UXP-28b120018135438eaff8307f3cdef921a697d47a.tar.lz UXP-28b120018135438eaff8307f3cdef921a697d47a.tar.xz UXP-28b120018135438eaff8307f3cdef921a697d47a.zip |
Fix some WebRTC tests to build with GCC 7.0.
Diffstat (limited to 'media/webrtc/signaling/test/mediaconduit_unittests.cpp')
-rw-r--r-- | media/webrtc/signaling/test/mediaconduit_unittests.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/media/webrtc/signaling/test/mediaconduit_unittests.cpp b/media/webrtc/signaling/test/mediaconduit_unittests.cpp index f0cf95a47..adcc838bf 100644 --- a/media/webrtc/signaling/test/mediaconduit_unittests.cpp +++ b/media/webrtc/signaling/test/mediaconduit_unittests.cpp @@ -550,14 +550,16 @@ class TransportConduitTest : public ::testing::Test mozilla::SyncRunnable::DispatchToThread(gMainThread, WrapRunnableNMRet(&mAudioSession, &mozilla::AudioSessionConduit::Create)); - if( !mAudioSession ) + if( !mAudioSession ) { ASSERT_NE(mAudioSession, (void*)nullptr); + } mozilla::SyncRunnable::DispatchToThread(gMainThread, WrapRunnableNMRet(&mAudioSession2, &mozilla::AudioSessionConduit::Create)); - if( !mAudioSession2 ) + if( !mAudioSession2 ) { ASSERT_NE(mAudioSession2, (void*)nullptr); + } WebrtcMediaTransport* xport = new WebrtcMediaTransport(); ASSERT_NE(xport, (void*)nullptr); @@ -615,15 +617,17 @@ class TransportConduitTest : public ::testing::Test mozilla::SyncRunnable::DispatchToThread(gMainThread, WrapRunnableNMRet(&mVideoSession, &mozilla::VideoSessionConduit::Create)); - if( !mVideoSession ) + if( !mVideoSession ) { ASSERT_NE(mVideoSession, (void*)nullptr); + } // This session is for other one mozilla::SyncRunnable::DispatchToThread(gMainThread, WrapRunnableNMRet(&mVideoSession2, &mozilla::VideoSessionConduit::Create)); - if( !mVideoSession2 ) + if( !mVideoSession2 ) { ASSERT_NE(mVideoSession2,(void*)nullptr); + } if (!send_vp8) { SetGmpCodecs(); @@ -716,8 +720,9 @@ class TransportConduitTest : public ::testing::Test mozilla::SyncRunnable::DispatchToThread(gMainThread, WrapRunnableNMRet(&videoSession, &mozilla::VideoSessionConduit::Create)); - if( !videoSession ) + if( !videoSession ) { ASSERT_NE(videoSession, (void*)nullptr); + } //Test Configure Recv Codec APIS cerr << " *************************************************" << endl; @@ -831,8 +836,9 @@ class TransportConduitTest : public ::testing::Test mozilla::SyncRunnable::DispatchToThread(gMainThread, WrapRunnableNMRet(&mVideoSession, &mozilla::VideoSessionConduit::Create)); - if( !mVideoSession ) + if( !mVideoSession ) { ASSERT_NE(mVideoSession, (void*)nullptr); + } mozilla::EncodingConstraints constraints; constraints.maxFs = max_fs; |