commit b4cff495a1f93b6c92f4327cbfb9e564b28913d8
author Dan Austin <danielaustin@google.com> Mon Mar 28 15:32:37 2016 -0700
committer Dan Austin <danielaustin@google.com> Tue Mar 29 17:17:51 2016 +0000
tree 4b11eadd5819a10ee5e4810aaa0f46f8125132a6
parent 8aeabe15dd38093029714dabb1713724400cf5f1

Address const issues in preparation for libcxx rebase.

Change-Id: I4eccc1b5a70da9dd325e1a7e10ab0a3fe588c03f

adb/socket_test.cpp

diff --git a/adb/socket_test.cpp b/adb/socket_test.cpp
index 5cbef6d..20a3bbb 100644
--- a/adb/socket_test.cpp
+++ b/adb/socket_test.cpp
@@ -275,8 +275,8 @@
 
 // Checks that skip_host_serial(serial) returns a pointer to the part of |serial| which matches
 // |expected|, otherwise logs the failure to gtest.
-void VerifySkipHostSerial(const std::string& serial, const char* expected) {
-    const char* result = internal::skip_host_serial(serial.c_str());
+void VerifySkipHostSerial(std::string serial, const char* expected) {
+    char* result = internal::skip_host_serial(&serial[0]);
     if (expected == nullptr) {
         EXPECT_EQ(nullptr, result);
     } else {