[FOLD] Address rebase conflicts

XRPLF · Jul 10, 2017 · 5a98901 · 5a98901
1 parent 7c10bd7
commit 5a98901
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/ripple/consensus/Consensus.h b/src/ripple/consensus/Consensus.h
@@ -532,7 +532,7 @@ Consensus<Adaptor>::startRound(
     if (prevLedger.id() != prevLedgerID)
     {
         // try to acquire the correct one
-        if (auto newLedger = impl().acquireLedger(prevLedgerID))
+        if (auto newLedger = adaptor_.acquireLedger(prevLedgerID))
         {
             prevLedger = *newLedger;
         }
@@ -1302,7 +1302,7 @@ Consensus<Adaptor>::updateOurPositions()
             if (!result_->position.isBowOut())
                 adaptor_.relay(result_->set);
 
-            for (auto const& p : peerProposals_)
+            for (auto const& p : currPeerPositions_)
             {
                 if (mode_.get() == ConsensusMode::proposing)
                 {
@@ -1313,7 +1313,7 @@ Consensus<Adaptor>::updateOurPositions()
 
         // Share our new position if we are still participating this round
         if (!result_->position.isBowOut() &&
-            (mode_ == ConsensusMode::proposing))
+            (mode_.get() == ConsensusMode::proposing))
             adaptor_.propose(result_->position);
     }
 }