commit ae74e42d2557b93a3da9ef75c51ef1f6aab3cc0a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 06 23:28:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 06 23:28:07 2018 +0000
tree b4c4210eaba1740d7ab3d9c81f7ee8513e44c2fb
parent 5dfe1e81d42cd5de98490523ba2c1b9dadcffaff
parent 8b47d316d253d05f92cf853d5b44cc28666848fe

Merge "Fix exit-time-destructor warning"

adb/client/usb_windows.cpp

diff --git a/adb/client/usb_windows.cpp b/adb/client/usb_windows.cpp
index 9751ebf..f529e8f 100644
--- a/adb/client/usb_windows.cpp
+++ b/adb/client/usb_windows.cpp
@@ -75,7 +75,7 @@
 static const GUID usb_class_id = ANDROID_USB_CLASS_ID;
 
 /// List of opened usb handles
-static std::vector<usb_handle*> handle_list;
+static std::vector<usb_handle*>& handle_list = *new std::vector<usb_handle*>();
 
 /// Locker for the list of opened usb handles
 static std::mutex& usb_lock = *new std::mutex();