From e8e4d69c7f3e325ade980672616337f90bfe2761 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 28 Jul 2021 09:02:25 +0200 Subject: [PATCH] Remove deprecated ScopedMessageData::data(). Bug: None Change-Id: I9dcb93db8c882eb90d2c0eadcb08bf9fb0753772 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227084 Reviewed-by: Harald Alvestrand Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#34591} --- rtc_base/async_invoker.cc | 2 +- rtc_base/thread_message.h | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/rtc_base/async_invoker.cc b/rtc_base/async_invoker.cc index 9d9dfd8016..4cf0aca78d 100644 --- a/rtc_base/async_invoker.cc +++ b/rtc_base/async_invoker.cc @@ -42,7 +42,7 @@ void DEPRECATED_AsyncInvoker::OnMessage(Message* msg) { ScopedMessageData* data = static_cast*>(msg->pdata); // Execute the closure and trigger the return message if needed. - data->inner_data().Execute(); + data->data().Execute(); delete data; } diff --git a/rtc_base/thread_message.h b/rtc_base/thread_message.h index e44ad7a48d..c610c3b911 100644 --- a/rtc_base/thread_message.h +++ b/rtc_base/thread_message.h @@ -46,15 +46,9 @@ class ScopedMessageData : public MessageData { public: explicit ScopedMessageData(std::unique_ptr data) : data_(std::move(data)) {} - // Deprecated. - // TODO(deadbeef): Returning a reference to a unique ptr? Why. Get rid of - // this once downstream applications stop using it, then rename inner_data to - // just data. - const std::unique_ptr& data() const { return data_; } - std::unique_ptr& data() { return data_; } - const T& inner_data() const { return *data_; } - T& inner_data() { return *data_; } + const T& data() const { return *data_; } + T& data() { return *data_; } T* Release() { return data_.release(); }