Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
Arthur Britto
2013-01-12 22:05:28 -08:00
4 changed files with 1 additions and 15 deletions

View File

@@ -331,7 +331,6 @@ void LedgerAcquire::trigger(Peer::ref peer)
return;
}
assert(mLedger);
if (mLedger)
tmGL.set_ledgerseq(mLedger->getLedgerSeq());

View File

@@ -92,9 +92,7 @@ SLE::pointer LedgerEntrySet::entryCache(LedgerEntryType letType, const uint256&
entryCache(sleEntry);
}
else if (action == taaDELETE)
{
assert(false);
}
sleEntry.reset();
}
return sleEntry;
}

View File

@@ -115,13 +115,6 @@ BOOST_AUTO_TEST_CASE(RangeSet_test)
RangeSet r1, r2;
if (r1 != r2) BOOST_FAIL("RangeSet fail");
r1.setValue(1);
if (r1 == r2) BOOST_FAIL("RangeSet fail");
r2.setRange(1, 1);
if (r1 != r2) BOOST_FAIL("RangeSet fail");
r1.clear();
r1.setRange(1,10);
r1.clearValue(5);
@@ -131,7 +124,6 @@ BOOST_AUTO_TEST_CASE(RangeSet_test)
r2.setRange(1, 4);
r2.setRange(6, 10);
r2.setRange(10, 20);
if (r1 != r2) BOOST_FAIL("RangeSet fail");
if (r1.hasValue(5)) BOOST_FAIL("RangeSet fail");
if (!r2.hasValue(9)) BOOST_FAIL("RangeSet fail");

View File

@@ -61,9 +61,6 @@ public:
static uint32 upper(const_reverse_iterator& it) { return it->upper() - 1; }
bool operator!=(const RangeSet& r) const { return mRanges != r.mRanges; }
bool operator==(const RangeSet& r) const { return mRanges == r.mRanges; }
std::string toString() const;
};