06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 5 Dec 2024 13:45:00 -0600
|
|
Subject: Bug 1934695 - (fix-3fa21c89c0) fix upstream compile issue in
|
|
apm_data_dumper.h
|
|
|
|
It is unclear why upstream modified a single DumpRaw call differently than
|
|
all the others, but it doesn't build for us. We'll fix it the same they
|
|
fixed all the other calls using [[maybe_unused]] annotations.
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8f64d5713228e3112f3014d9a269dce10795febf
|
|
---
|
|
modules/audio_processing/logging/apm_data_dumper.h | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules/audio_processing/logging/apm_data_dumper.h b/modules/audio_processing/logging/apm_data_dumper.h
|
|
index 09d24bd034..d05b580b09 100644
|
|
--- a/modules/audio_processing/logging/apm_data_dumper.h
|
|
+++ b/modules/audio_processing/logging/apm_data_dumper.h
|
|
@@ -348,9 +348,9 @@ class ApmDataDumper {
|
|
#endif
|
|
}
|
|
|
|
- void DumpRaw(absl::string_view /* name */,
|
|
- rtc::ArrayView<const size_t> /* v */,
|
|
- int /* dump_set */ = kDefaultDumpSet) {
|
|
+ void DumpRaw([[maybe_unused]] absl::string_view name,
|
|
+ [[maybe_unused]] rtc::ArrayView<const size_t> v,
|
|
+ [[maybe_unused]] int dump_set = kDefaultDumpSet) {
|
|
#if WEBRTC_APM_DEBUG_DUMP == 1
|
|
if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
|
|
return;
|