From b6843428c66d3d082cc2a579cdb38166798cb502 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 8 Jan 2021 14:09:28 +0800 Subject: [PATCH] Fix build warnings --- trunk/src/utest/srs_utest_mp4.cpp | 10 +++++----- trunk/src/utest/srs_utest_rtc.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/trunk/src/utest/srs_utest_mp4.cpp b/trunk/src/utest/srs_utest_mp4.cpp index a2537416b..c5861b88b 100644 --- a/trunk/src/utest/srs_utest_mp4.cpp +++ b/trunk/src/utest/srs_utest_mp4.cpp @@ -499,7 +499,7 @@ VOID TEST(KernelMp4Test, FullBoxDump) SrsMp4FileTypeBox box; box.major_brand = SrsMp4BoxBrandISO2; box.compatible_brands.push_back(SrsMp4BoxBrandISOM); - EXPECT_EQ(20, box.update_size()); + EXPECT_EQ(20, (int)box.update_size()); stringstream ss; SrsMp4DumpContext dc; @@ -514,7 +514,7 @@ VOID TEST(KernelMp4Test, FullBoxDump) box.type = SrsMp4BoxTypeFTYP; box.version = 1; box.flags = 0x02; - EXPECT_EQ(12, box.update_size()); + EXPECT_EQ(12, (int)box.update_size()); stringstream ss; SrsMp4DumpContext dc; @@ -528,7 +528,7 @@ VOID TEST(KernelMp4Test, FullBoxDump) SrsMp4FullBox box; box.type = SrsMp4BoxTypeFTYP; box.version = 1; - EXPECT_EQ(12, box.update_size()); + EXPECT_EQ(12, (int)box.update_size()); stringstream ss; SrsMp4DumpContext dc; @@ -541,7 +541,7 @@ VOID TEST(KernelMp4Test, FullBoxDump) if (true) { SrsMp4FullBox box; box.type = SrsMp4BoxTypeFTYP; - EXPECT_EQ(12, box.update_size()); + EXPECT_EQ(12, (int)box.update_size()); stringstream ss; SrsMp4DumpContext dc; @@ -570,7 +570,7 @@ VOID TEST(KernelMp4Test, MFHDBox) if (true) { SrsMp4MovieFragmentHeaderBox box; box.sequence_number = 3; - EXPECT_EQ(16, box.update_size()); + EXPECT_EQ(16, (int)box.update_size()); stringstream ss; SrsMp4DumpContext dc; diff --git a/trunk/src/utest/srs_utest_rtc.cpp b/trunk/src/utest/srs_utest_rtc.cpp index 962fca807..577e2bd98 100644 --- a/trunk/src/utest/srs_utest_rtc.cpp +++ b/trunk/src/utest/srs_utest_rtc.cpp @@ -474,25 +474,25 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) MockSrsConnection* conn = new MockSrsConnection(); conn->do_switch = true; manager.add(conn); - EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size()); manager.remove(conn); // Remove conn to zombies. - EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, (int)manager.zombies_.size()); srs_usleep(0); // Switch to manager coroutine to try to free zombies. - EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size()); } if (true) { // Now the previous conn switch back to here, and lost the signal. MockSrsConnection* conn = new MockSrsConnection(); manager.add(conn); - EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size()); manager.remove(conn); // Remove conn to zombies, signal is lost. - EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, (int)manager.zombies_.size()); srs_usleep(0); // Switch to manager, but no signal is triggered before, so conn will be freed by loop. - EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size()); } } }