From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 26 Feb 2013 10:13:45 +0000 (+0100)
Subject: Paxos.cc: use empty() instead of size()
X-Git-Tag: v0.59~111^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed83d4b9df514018b8063d87cc2f2c7c519dd6ca;p=ceph.git

Paxos.cc: use empty() instead of size()

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 6b5fc91179c..df3b6d65e70 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -803,7 +803,7 @@ void Paxos::finish_proposal()
   first_committed = get_store()->get(get_name(), "first_committed");
   last_committed = get_store()->get(get_name(), "last_committed");
 
-  if ((proposals.size() == 0) && going_to_bootstrap) {
+  if (proposals.empty() && going_to_bootstrap) {
     dout(0) << __func__ << " no more proposals; bootstraping." << dendl;
     mon->bootstrap();
     return;
@@ -813,7 +813,7 @@ void Paxos::finish_proposal()
     trim();
   }
 
-  if (is_active() && (proposals.size() > 0)) {
+  if (is_active() && !proposals.empty()) {
     propose_queued();
   }
 }
@@ -1054,7 +1054,7 @@ void Paxos::leader_init()
 {
   cancel_events();
   new_value.clear();
-  if (proposals.size() > 0)
+  if (!proposals.empty())
     proposals.clear();
 
   going_to_bootstrap = false;
@@ -1090,7 +1090,7 @@ void Paxos::restart()
   cancel_events();
   new_value.clear();
   dout(10) << __func__ << " -- clearing queued proposals" << dendl;
-  if (proposals.size() > 0)
+  if (!proposals.empty())
     proposals.clear();
 
   going_to_bootstrap = false;
@@ -1219,7 +1219,7 @@ void Paxos::list_proposals(ostream& out)
 void Paxos::propose_queued()
 {
   assert(is_active());
-  assert(proposals.size() > 0);
+  assert(!proposals.empty());
 
   state = STATE_PREPARING;