diff --git a/rtc_base/system/unused.h b/rtc_base/system/unused.h index a5732a7e84..03d0c2f0a7 100644 --- a/rtc_base/system/unused.h +++ b/rtc_base/system/unused.h @@ -18,7 +18,11 @@ // Note: In most cases it is better to remove the unused variable rather than // suppressing the compiler warning. #ifndef RTC_UNUSED +#ifdef __cplusplus #define RTC_UNUSED(x) static_cast(x) +#else +#define RTC_UNUSED(x) (void)(x) +#endif #endif // RTC_UNUSED #endif // RTC_BASE_SYSTEM_UNUSED_H_ diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 90e245a18d..b59e9cae24 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1083,6 +1083,7 @@ if (is_ios || is_mac) { "../media:rtc_media_tests_utils", "../rtc_base", "../rtc_base:gunit_helpers", + "../rtc_base/system:unused", "../system_wrappers", "//third_party/libyuv", ] diff --git a/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m b/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m index 629095b81d..af9e2dcde5 100644 --- a/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m +++ b/sdk/objc/unittests/RTCPeerConnectionFactory_xctest.m @@ -21,6 +21,7 @@ #import "api/peerconnection/RTCRtpTransceiver.h" #import "api/peerconnection/RTCSessionDescription.h" #import "api/peerconnection/RTCVideoSource.h" +#import "rtc_base/system/unused.h" #import @@ -64,6 +65,7 @@ factory = nil; } mediaStream = nil; + RTC_UNUSED(mediaStream); } XCTAssertTrue(true, "Expect test does not crash"); diff --git a/sdk/objc/unittests/nalu_rewriter_xctest.mm b/sdk/objc/unittests/nalu_rewriter_xctest.mm index 995cc80da4..82da549bb6 100644 --- a/sdk/objc/unittests/nalu_rewriter_xctest.mm +++ b/sdk/objc/unittests/nalu_rewriter_xctest.mm @@ -352,6 +352,7 @@ static const uint8_t SPS_PPS_BUFFER[] = { cmsampleSize, kCMBlockBufferAssureMemoryNowFlag, &block_buffer); + XCTAssertEqual(kCMBlockBufferNoErr, status); status = CMSampleBufferCreate(nullptr, block_buffer, @@ -365,6 +366,7 @@ static const uint8_t SPS_PPS_BUFFER[] = { 0, nullptr, &sample_buffer); + XCTAssertEqual(noErr, status); return sample_buffer; }