From 6174e922ef0e819d0b8f8f16ad863c83f8fa6421 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 15 Mar 2016 13:49:19 -0500 Subject: tweak a couple of 'auto' declarations that g++ 5.3.1 understands but 4.9.2 on vivid doesn't --- src/adbd-client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/adbd-client.cpp b/src/adbd-client.cpp index edd403c..30929a7 100644 --- a/src/adbd-client.cpp +++ b/src/adbd-client.cpp @@ -115,7 +115,7 @@ private: void worker_func() // runs in worker thread { - const auto socket_path {m_socket_path}; + const std::string socket_path {m_socket_path}; while (!g_cancellable_is_cancelled(m_cancellable)) { @@ -155,7 +155,7 @@ private: // If nothing interesting's happening, sleep a bit. // (Interval copied from UsbDebuggingManager.java) - static constexpr auto sleep_interval {std::chrono::seconds(1)}; + static constexpr std::chrono::seconds sleep_interval {std::chrono::seconds(1)}; if (!got_valid_req && !g_cancellable_is_cancelled(m_cancellable)) { std::unique_lock lk(m_sleep_mutex); m_sleep_cv.wait_for(lk, sleep_interval); -- cgit v1.2.3