commit 7f8f0cef39f1157b6b23f0291dd43c6c61e0860b
author Ryan Haining <haining@google.com> Sat Apr 07 09:49:28 2018 -0700
committer Ryan Haining <haining@google.com> Mon Apr 09 17:36:13 2018 +0000
tree 3d20b70d7befa25e5b1bac357df74eeb7fe1cf7e
parent 67686262dabd3baa446031d1122a983b791ddacc

(vhci) Removes unique_ptr<thread>

Bug: 77731993
Test: Build and boot oc
Change-Id: I5127b31e8b45c39b95dfc8685e5bbb2273aa619b
(cherry picked from commit b8afc419235a93708c74de51d95584a9ba091e49)

host/libs/usbip/vhci_instrument.cpp

diff --git a/host/libs/usbip/vhci_instrument.cpp b/host/libs/usbip/vhci_instrument.cpp
index 179d6c5..10025fc 100644
--- a/host/libs/usbip/vhci_instrument.cpp
+++ b/host/libs/usbip/vhci_instrument.cpp
@@ -82,7 +82,7 @@
 
 VHCIInstrument::~VHCIInstrument() {
   control_write_end_->Write(&kControlExit, sizeof(kControlExit));
-  attach_thread_->join();
+  attach_thread_.join();
 }
 
 bool VHCIInstrument::Init() {
@@ -110,7 +110,7 @@
     return false;
   }
 
-  attach_thread_.reset(new std::thread([this]() { AttachThread(); }));
+  attach_thread_ = std::thread([this] { AttachThread(); });
   return true;
 }
 

host/libs/usbip/vhci_instrument.h

diff --git a/host/libs/usbip/vhci_instrument.h b/host/libs/usbip/vhci_instrument.h
index ccb641e..3a4a7e3 100644
--- a/host/libs/usbip/vhci_instrument.h
+++ b/host/libs/usbip/vhci_instrument.h
@@ -58,7 +58,7 @@
 
  private:
   std::string name_;
-  std::unique_ptr<std::thread> attach_thread_;
+  std::thread attach_thread_;
   std::string syspath_;
   cvd::SharedFD control_write_end_;
   cvd::SharedFD control_read_end_;