From 00b31cc72aba85eab4041047605e8d583cd70fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 29 Mar 2022 11:33:00 +0200 Subject: [PATCH] Add (temporary) using declaration for BasicNetworkManager::GetNetworks Needed to migrate downstream code that needs to call new signature of BasicNetworkManager::GetNetworks(). And similarly for GetAnyAddressNetworks. Bug: webrtc:13869 Change-Id: I8b9e842e74e290662c0713846dc29ac739d76ba2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256977 Auto-Submit: Niels Moller Reviewed-by: Jonas Oreland Reviewed-by: Tomas Gunnarsson Commit-Queue: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#36366} --- rtc_base/network.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rtc_base/network.h b/rtc_base/network.h index 067ecb4f27..17cac6eed5 100644 --- a/rtc_base/network.h +++ b/rtc_base/network.h @@ -211,6 +211,11 @@ class RTC_EXPORT NetworkManagerBase : public NetworkManager { NetworkManagerBase(const webrtc::FieldTrialsView* field_trials = nullptr); ~NetworkManagerBase() override; + // The using declarations are needed to inherit new signature variant. + // TODO(bugs.webrtc.org/13869): Delete using declarations when old signature + // is replaced. + using NetworkManager::GetAnyAddressNetworks; + using NetworkManager::GetNetworks; void GetNetworks(NetworkList* networks) const override; void GetAnyAddressNetworks(NetworkList* networks) override;