From: Michal Jarzabek <stiopa@gmail.com>
Date: Tue, 13 Sep 2016 17:35:54 +0000 (+0100)
Subject: common/Timer.cc: replace long types with auto
X-Git-Tag: v11.0.1~237^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c497fb6fd6d3414b1318e6adfa37f5627bcb1bef;p=ceph.git

common/Timer.cc: replace long types with auto

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
---

diff --git a/src/common/Timer.cc b/src/common/Timer.cc
index b71511dc4e33..4f48e5443cd7 100644
--- a/src/common/Timer.cc
+++ b/src/common/Timer.cc
@@ -156,7 +156,7 @@ bool SafeTimer::cancel_event(Context *callback)
 {
   assert(lock.is_locked());
   
-  std::map<Context*, std::multimap<utime_t, Context*>::iterator>::iterator p = events.find(callback);
+  auto p = events.find(callback);
   if (p == events.end()) {
     ldout(cct,10) << "cancel_event " << callback << " not found" << dendl;
     return false;
@@ -176,7 +176,7 @@ void SafeTimer::cancel_all_events()
   assert(lock.is_locked());
   
   while (!events.empty()) {
-    std::map<Context*, std::multimap<utime_t, Context*>::iterator>::iterator p = events.begin();
+    auto p = events.begin();
     ldout(cct,10) << " cancelled " << p->second->first << " -> " << p->first << dendl;
     delete p->first;
     schedule.erase(p->second);