From 77d3711f08282d8b424ce2e613cc6d4cf5c6fdbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 15 Jan 2018 12:59:43 +0100 Subject: [PATCH] Delete unused use_socket_server argument. Bug: webrtc:7723 Change-Id: Ie048f59ed482d509742170cca6c9c1887c58dafd Reviewed-on: https://webrtc-review.googlesource.com/39507 Reviewed-by: Tommi Reviewed-by: Taylor Brandstetter Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#21649} --- rtc_base/nethelpers.cc | 2 +- rtc_base/signalthread.cc | 4 ++-- rtc_base/signalthread.h | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/rtc_base/nethelpers.cc b/rtc_base/nethelpers.cc index 4702de71e4..c41e12492a 100644 --- a/rtc_base/nethelpers.cc +++ b/rtc_base/nethelpers.cc @@ -84,7 +84,7 @@ int ResolveHostname(const std::string& hostname, int family, // AsyncResolver AsyncResolver::AsyncResolver() - : SignalThread(false /* use_socket_server */), error_(-1) {} + : SignalThread(), error_(-1) {} AsyncResolver::~AsyncResolver() = default; diff --git a/rtc_base/signalthread.cc b/rtc_base/signalthread.cc index 3856dac99e..4bf7d7c4eb 100644 --- a/rtc_base/signalthread.cc +++ b/rtc_base/signalthread.cc @@ -18,9 +18,9 @@ namespace rtc { // SignalThread /////////////////////////////////////////////////////////////////////////////// -SignalThread::SignalThread(bool use_socket_server) +SignalThread::SignalThread() : main_(Thread::Current()), - worker_(this, use_socket_server), + worker_(this), state_(kInit), refcount_(1) { main_->SignalQueueDestroyed.connect(this, diff --git a/rtc_base/signalthread.h b/rtc_base/signalthread.h index 68b7f84085..2c11da4507 100644 --- a/rtc_base/signalthread.h +++ b/rtc_base/signalthread.h @@ -42,7 +42,7 @@ class SignalThread : public sigslot::has_slots<>, protected MessageHandler { public: - explicit SignalThread(bool use_socket_server = true); + SignalThread(); // Context: Main Thread. Call before Start to change the worker's name. bool SetName(const std::string& name, const void* obj); @@ -104,10 +104,8 @@ class SignalThread class Worker : public Thread { public: - explicit Worker(SignalThread* parent, bool use_socket_server) - : Thread(use_socket_server - ? SocketServer::CreateDefault() - : std::unique_ptr(new NullSocketServer())), + explicit Worker(SignalThread* parent) + : Thread(std::unique_ptr(new NullSocketServer())), parent_(parent) {} ~Worker() override; void Run() override;