From 45b33934e878908332c9fee239b47db7657302ee Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Fri, 23 Sep 2016 14:46:54 +0100
Subject: [PATCH] mgr: fixup ClusterState with_*map fns

Signed-off-by: John Spray <john.spray@redhat.com>
---
 src/mgr/ClusterState.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mgr/ClusterState.h b/src/mgr/ClusterState.h
index c63ca27604c..039da14e8dc 100644
--- a/src/mgr/ClusterState.h
+++ b/src/mgr/ClusterState.h
@@ -87,20 +87,21 @@ public:
         std::forward<Args>(args)...);
   }
 
-  template<typename Callback, typename...Args>
-  void with_monmap(Callback&& cb, Args&&...args)
+  template<typename... Args>
+  void with_monmap(Args &&... args)
   {
     Mutex::Locker l(lock);
     assert(monc != nullptr);
-    monc->with_monmap(cb);
+    monc->with_monmap(std::forward<Args>(args)...);
   }
 
-  template<typename Callback, typename...Args>
-  void with_osdmap(Callback&& cb, Args&&...args)
+  template<typename... Args>
+  void with_osdmap(Args &&... args)
   {
     assert(objecter != nullptr);
-    objecter->with_osdmap(cb);
+    objecter->with_osdmap(std::forward<Args>(args)...);
   }
+
 };
 
 #endif
-- 
2.39.5