From 8f5f8bdb4e3270e033343c2ea7d091cd62746b9b Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 12 Jan 2013 21:44:38 -0800 Subject: [PATCH 1/3] It was my bug after all. Fix create after delete. --- src/cpp/ripple/LedgerEntrySet.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cpp/ripple/LedgerEntrySet.cpp b/src/cpp/ripple/LedgerEntrySet.cpp index d0affac0c0..18780f1de8 100644 --- a/src/cpp/ripple/LedgerEntrySet.cpp +++ b/src/cpp/ripple/LedgerEntrySet.cpp @@ -92,9 +92,7 @@ SLE::pointer LedgerEntrySet::entryCache(LedgerEntryType letType, const uint256& entryCache(sleEntry); } else if (action == taaDELETE) - { - assert(false); - } + sleEntry.reset(); } return sleEntry; } From e5c1b3e6f2eeedfd56ba6d1cceff46e7bf1c1c13 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 12 Jan 2013 21:48:15 -0800 Subject: [PATCH 2/3] Remove a bogus assert. --- src/cpp/ripple/LedgerAcquire.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp index 9a71dcd24e..8f5e744cb7 100644 --- a/src/cpp/ripple/LedgerAcquire.cpp +++ b/src/cpp/ripple/LedgerAcquire.cpp @@ -331,7 +331,6 @@ void LedgerAcquire::trigger(Peer::ref peer) return; } - assert(mLedger); if (mLedger) tmGL.set_ledgerseq(mLedger->getLedgerSeq()); From 5a22118b25e10e1a9e74b35f761f8ef594cf59f0 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 12 Jan 2013 21:48:25 -0800 Subject: [PATCH 3/3] Remove operator== and operator!= on RangeSet. --- src/cpp/ripple/RangeSet.cpp | 8 -------- src/cpp/ripple/RangeSet.h | 3 --- 2 files changed, 11 deletions(-) diff --git a/src/cpp/ripple/RangeSet.cpp b/src/cpp/ripple/RangeSet.cpp index e9c4b38f9a..cc9e6d9abe 100644 --- a/src/cpp/ripple/RangeSet.cpp +++ b/src/cpp/ripple/RangeSet.cpp @@ -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"); diff --git a/src/cpp/ripple/RangeSet.h b/src/cpp/ripple/RangeSet.h index 5ccf89f07c..77ac65290d 100644 --- a/src/cpp/ripple/RangeSet.h +++ b/src/cpp/ripple/RangeSet.h @@ -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; };