From: Samuel Just <sam.just@inktank.com>
Date: Wed, 3 Jul 2013 18:18:33 +0000 (-0700)
Subject: Elector.h: features are 64 bit
X-Git-Tag: v0.67-rc1~155
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3564e304e3f50642e4d9ff25e529d5fc60629093;p=ceph.git

Elector.h: features are 64 bit

Fixes: #5497
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>
---

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 7172510d807..4b1221d2c31 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -152,9 +152,10 @@ void Elector::victory()
   leader_acked = -1;
   electing_me = false;
 
-  unsigned features = CEPH_FEATURES_ALL;
+  uint64_t features = CEPH_FEATURES_ALL;
   set<int> quorum;
-  for (map<int,unsigned>::iterator p = acked_me.begin(); p != acked_me.end(); ++p) {
+  for (map<int, uint64_t>::iterator p = acked_me.begin(); p != acked_me.end();
+       ++p) {
     quorum.insert(p->first);
     features &= p->second;
   }    
diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index d81eb239763..f1f19b49bec 100644
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -113,7 +113,7 @@ class Elector {
    * If we are acked by everyone in the MonMap, we will declare
    * victory.  Also note each peer's feature set.
    */
-  map<int, unsigned> acked_me;
+  map<int, uint64_t> acked_me;
   /**
    * @}
    */