From 7bbd49c72c0daa7036a575a49f6cf13bf8a7020e Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 12 Oct 2016 22:32:55 -0400 Subject: [core] extract weak_ptr mailbox->receive into Mailbox::maybeReceive --- platform/default/thread_pool.cpp | 4 +--- platform/node/src/node_thread_pool.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'platform') diff --git a/platform/default/thread_pool.cpp b/platform/default/thread_pool.cpp index 7108312c58..b7e02db157 100644 --- a/platform/default/thread_pool.cpp +++ b/platform/default/thread_pool.cpp @@ -22,9 +22,7 @@ ThreadPool::ThreadPool(std::size_t count) { queue.pop(); lock.unlock(); - if (auto locked = mailbox.lock()) { - locked->receive(); - } + Mailbox::maybeReceive(mailbox); } }); } diff --git a/platform/node/src/node_thread_pool.cpp b/platform/node/src/node_thread_pool.cpp index a9faef6f09..fd6df575fc 100644 --- a/platform/node/src/node_thread_pool.cpp +++ b/platform/node/src/node_thread_pool.cpp @@ -27,9 +27,7 @@ NodeThreadPool::Worker::Worker(std::weak_ptr mailbox_) mailbox(std::move(mailbox_)) {}; void NodeThreadPool::Worker::Execute() { - if (auto locked = mailbox.lock()) { - locked->receive(); - } + mbgl::Mailbox::maybeReceive(mailbox); } void NodeThreadPool::Worker::WorkComplete() { -- cgit v1.2.1