commit 83c78abdbf54156f40624c7fdee31121079987f2
author Elliott Hughes <enh@google.com> Sat May 06 05:24:47 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 06 05:24:49 2017 +0000
tree 5f62e4abc6dbfec0c6bc298bcc1d2ac6175ee617
parent d1b3d5b8b5774966929dede89627e53fc88c4f59
parent 781b33e8474be3f7161797f4feef0d9d947ce5e1

Merge "Give slightly less useless versions to adb and fastboot."

adb/client/usb_libusb.cpp

diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
index a32c605..7539e5a 100644
--- a/adb/client/usb_libusb.cpp
+++ b/adb/client/usb_libusb.cpp
@@ -159,6 +159,7 @@
                         libusb_get_device_address(device));
 }
 
+#if defined(__linux__)
 static std::string get_device_serial_path(libusb_device* device) {
     uint8_t ports[7];
     int port_count = libusb_get_port_numbers(device, ports, 7);
@@ -172,6 +173,7 @@
     path += "/serial";
     return path;
 }
+#endif
 
 static bool endpoint_is_output(uint8_t endpoint) {
     return (endpoint & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT;

libmemunreachable/tests/ThreadCapture_test.cpp

diff --git a/libmemunreachable/tests/ThreadCapture_test.cpp b/libmemunreachable/tests/ThreadCapture_test.cpp
index 41ed84e..44aabd7 100644
--- a/libmemunreachable/tests/ThreadCapture_test.cpp
+++ b/libmemunreachable/tests/ThreadCapture_test.cpp
@@ -55,7 +55,7 @@
     threads_.reserve(threads);
     tids_.reserve(threads);
     for (unsigned int i = 0; i < threads; i++) {
-      threads_.emplace_back([&, i, threads, this]() {
+      threads_.emplace_back([&, threads, this]() {
         {
           std::lock_guard<std::mutex> lk(m_);
           tids_.push_back(gettid());