commit eb52c4d2ec33fc966374740851a4f4be6b1e37ea
author Ryan Haining <haining@google.com> Fri Apr 06 20:34:53 2018 -0700
committer Ryan Haining <haining@google.com> Sat Apr 07 09:56:02 2018 -0700
tree 78f36b269cf5f3f9c596b241d669af2e6c7dcd12
parent 2b5c5d92253d1d9067a9fd284d21a9ff812a6b09

(region_view) Removes unique_ptr<thread>

Bug: 77731993
Test: Build and boot oc

Change-Id: Id3ce0bed59021dc8cfa3628c42cdc507656839cf

common/vsoc/lib/region_view.cpp

diff --git a/common/vsoc/lib/region_view.cpp b/common/vsoc/lib/region_view.cpp
index 4fcadc6..dc1088c 100644
--- a/common/vsoc/lib/region_view.cpp
+++ b/common/vsoc/lib/region_view.cpp
@@ -18,8 +18,8 @@
       stopping_(false) {}
 
 void vsoc::RegionWorker::start() {
-  CHECK(thread_ == nullptr);
-  thread_.reset(new std::thread(&vsoc::RegionWorker::Work, this));
+  CHECK(!thread_.joinable());
+  thread_ = std::thread(&vsoc::RegionWorker::Work, this);
 }
 
 void vsoc::RegionWorker::Work() {
@@ -37,9 +37,9 @@
 vsoc::RegionWorker::~RegionWorker() {
   stopping_ = true;
 
-  if (thread_ != nullptr) {
+  if (thread_.joinable()) {
     region_->InterruptSelf();
-    thread_->join();
+    thread_.join();
   }
 }
 

common/vsoc/lib/region_view.h

diff --git a/common/vsoc/lib/region_view.h b/common/vsoc/lib/region_view.h
index af089f3..055f721 100644
--- a/common/vsoc/lib/region_view.h
+++ b/common/vsoc/lib/region_view.h
@@ -58,7 +58,7 @@
  protected:
   std::shared_ptr<RegionControl> control_;
   RegionView* region_;
-  std::unique_ptr<std::thread> thread_;
+  std::thread thread_;
   volatile bool stopping_;
 };