aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-03-15 13:49:19 -0500
committerCharles Kerr <charles.kerr@canonical.com>2016-03-15 13:49:19 -0500
commit6174e922ef0e819d0b8f8f16ad863c83f8fa6421 (patch)
treeb5aefa1f4a29d71601a8406d1938b1ad5e053284 /src
parentbb4fe392f34fc6f839870967fe273dd1e3d1ed53 (diff)
downloadayatana-indicator-display-6174e922ef0e819d0b8f8f16ad863c83f8fa6421.tar.gz
ayatana-indicator-display-6174e922ef0e819d0b8f8f16ad863c83f8fa6421.tar.bz2
ayatana-indicator-display-6174e922ef0e819d0b8f8f16ad863c83f8fa6421.zip
tweak a couple of 'auto' declarations that g++ 5.3.1 understands but 4.9.2 on vivid doesn't
Diffstat (limited to 'src')
-rw-r--r--src/adbd-client.cpp4
1 files 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<std::mutex> lk(m_sleep_mutex);
m_sleep_cv.wait_for(lk, sleep_interval);