]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common/Timer.cc: replace long types with auto 11067/head
authorMichal Jarzabek <stiopa@gmail.com>
Tue, 13 Sep 2016 17:35:54 +0000 (18:35 +0100)
committerMichal Jarzabek <stiopa@gmail.com>
Tue, 13 Sep 2016 17:35:54 +0000 (18:35 +0100)
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
src/common/Timer.cc

index b71511dc4e337e84d8001ccf2e128d1ef1230e00..4f48e5443cd763e51f192ad252df1f02d99becb9 100644 (file)
@@ -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);