From d71e5918945bfe3d13f77fc6cc196b9ee2113d11 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 29 Mar 2021 22:17:36 +0200 Subject: [PATCH] Delete a gcc workaround in rtc::FinalRefCountedObject with bot using old version of gcc removed, this workaround is not needed. Bug: webrtc:12481 Change-Id: Ib1bfb6260c7ff5688c39fa05e8a62225700b9f27 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213187 Reviewed-by: Mirko Bonadei Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#33592} --- rtc_base/ref_counted_object.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/rtc_base/ref_counted_object.h b/rtc_base/ref_counted_object.h index e86a1fba0d..873eaccd47 100644 --- a/rtc_base/ref_counted_object.h +++ b/rtc_base/ref_counted_object.h @@ -80,14 +80,7 @@ class FinalRefCountedObject final : public T { private: ~FinalRefCountedObject() = default; - // gcc v7.1 requires default contructors for members of - // `FinalRefCountedObject` to be able to use inherited constructors. - // TODO(danilchap): Replace with simpler braced initialization when - // bot support for that version of gcc is dropped. - class ZeroBasedRefCounter : public webrtc::webrtc_impl::RefCounter { - public: - ZeroBasedRefCounter() : RefCounter(0) {} - } mutable ref_count_; + mutable webrtc::webrtc_impl::RefCounter ref_count_{0}; }; } // namespace rtc