From 36207d600af8344b5fae71d57c1ac5398bfd383c Mon Sep 17 00:00:00 2001 From: Tommi Date: Tue, 28 Nov 2017 20:13:03 +0100 Subject: [PATCH] Remove "using rtc::scoped_ptr" from audiotrack.cc. This is causing compilation issues in a chromium cl because of type conflicts. BUG=none TBR=henrikg@webrtc.org Tbr-ing to fix build issue upstream and because there's no code change. Change-Id: Ia34ae3844fe3f57f047cb44422fa591f752b7bda Reviewed-on: https://webrtc-review.googlesource.com/26680 Reviewed-by: Tommi Commit-Queue: Tommi Cr-Commit-Position: refs/heads/master@{#20921} --- pc/audiotrack.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pc/audiotrack.cc b/pc/audiotrack.cc index 408399122a..2a3e5e3878 100644 --- a/pc/audiotrack.cc +++ b/pc/audiotrack.cc @@ -13,19 +13,17 @@ #include "rtc_base/checks.h" #include "rtc_base/refcountedobject.h" -using rtc::scoped_refptr; - namespace webrtc { // static -scoped_refptr AudioTrack::Create( +rtc::scoped_refptr AudioTrack::Create( const std::string& id, - const scoped_refptr& source) { + const rtc::scoped_refptr& source) { return new rtc::RefCountedObject(id, source); } AudioTrack::AudioTrack(const std::string& label, - const scoped_refptr& source) + const rtc::scoped_refptr& source) : MediaStreamTrack(label), audio_source_(source) { if (audio_source_) { audio_source_->RegisterObserver(this);