Fix -Wunused-but-set-variable Bug: chromium:1203071 Change-Id: I338bd31ab0e74751f2c0abd5d441ea03ac33dead Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237880 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35350}
diff --git a/rtc_base/system/unused.h b/rtc_base/system/unused.h index a5732a7..03d0c2f 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<void>(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 90e245a..b59e9ca 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn
@@ -1083,6 +1083,7 @@ "../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 629095b..af9e2dc 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 <XCTest/XCTest.h> @@ -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 995cc80..82da549 100644 --- a/sdk/objc/unittests/nalu_rewriter_xctest.mm +++ b/sdk/objc/unittests/nalu_rewriter_xctest.mm
@@ -352,6 +352,7 @@ cmsampleSize, kCMBlockBufferAssureMemoryNowFlag, &block_buffer); + XCTAssertEqual(kCMBlockBufferNoErr, status); status = CMSampleBufferCreate(nullptr, block_buffer, @@ -365,6 +366,7 @@ 0, nullptr, &sample_buffer); + XCTAssertEqual(noErr, status); return sample_buffer; }