From 2e9d6a0d7dd0ce63260905d3830df7b6780407b6 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 22 Nov 2012 10:11:38 -0800 Subject: [PATCH 1/4] Cleanup. --- src/cpp/ripple/LedgerEntrySet.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cpp/ripple/LedgerEntrySet.cpp b/src/cpp/ripple/LedgerEntrySet.cpp index 59df4ec215..45a226ece0 100644 --- a/src/cpp/ripple/LedgerEntrySet.cpp +++ b/src/cpp/ripple/LedgerEntrySet.cpp @@ -419,7 +419,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result) prevs.addObject(obj); } if (!prevs.empty()) - mSet.getAffectedNode(it.first, *type).addObject(prevs); + mSet.getAffectedNode(it.first).addObject(prevs); STObject finals(sfFinalFields); BOOST_FOREACH(const SerializedType& obj, *curNode) @@ -428,7 +428,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result) finals.addObject(obj); } if (!finals.empty()) - mSet.getAffectedNode(it.first, *type).addObject(finals); + mSet.getAffectedNode(it.first).addObject(finals); } else if (type == &sfModifiedNode) { @@ -442,7 +442,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result) prevs.addObject(obj); } if (!prevs.empty()) - mSet.getAffectedNode(it.first, *type).addObject(prevs); + mSet.getAffectedNode(it.first).addObject(prevs); STObject finals(sfFinalFields); BOOST_FOREACH(const SerializedType& obj, *curNode) @@ -451,7 +451,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result) finals.addObject(obj); } if (!finals.empty()) - mSet.getAffectedNode(it.first, *type).addObject(finals); + mSet.getAffectedNode(it.first).addObject(finals); } else if (type == &sfCreatedNode) // if created, thread to owner(s) { @@ -460,6 +460,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result) if (curNode->isThreadedType()) // always thread to self threadTx(curNode, mLedger, newMod); + STObject news(sfNewFields); BOOST_FOREACH(const SerializedType& obj, *curNode) { // save non-default values @@ -467,7 +468,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result) news.addObject(obj); } if (!news.empty()) - mSet.getAffectedNode(it.first, *type).addObject(news); + mSet.getAffectedNode(it.first).addObject(news); } } From 520ad2938742e90f0c26bb37b495591852f2f9e1 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 22 Nov 2012 12:24:54 -0800 Subject: [PATCH 2/4] Fix compilation errors/warnings. --- src/cpp/ripple/LoadMonitor.h | 2 +- src/cpp/ripple/SHAMapSync.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cpp/ripple/LoadMonitor.h b/src/cpp/ripple/LoadMonitor.h index 08c2afbf21..992046c178 100644 --- a/src/cpp/ripple/LoadMonitor.h +++ b/src/cpp/ripple/LoadMonitor.h @@ -69,7 +69,7 @@ public: assert(mRunning); mRunning = false; mMonitor.addCountAndLatency(mCount, - (boost::posix_time::microsec_clock::universal_time() - mStartTime).total_milliseconds()); + static_cast((boost::posix_time::microsec_clock::universal_time() - mStartTime).total_milliseconds())); } }; diff --git a/src/cpp/ripple/SHAMapSync.cpp b/src/cpp/ripple/SHAMapSync.cpp index 7abcf9fd8f..94b970a311 100644 --- a/src/cpp/ripple/SHAMapSync.cpp +++ b/src/cpp/ripple/SHAMapSync.cpp @@ -486,7 +486,6 @@ BOOST_AUTO_TEST_CASE( SHAMapSync_test ) BOOST_FAIL("NodeSize"); } - SMAddNode node(); if (!destination.addRootNode(*gotNodes.begin(), snfWIRE, NULL)) { cLog(lsFATAL) << "AddRootNode fails"; From 7acdb36257121b21f2ba30784974c85e1af80ab8 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 22 Nov 2012 12:25:08 -0800 Subject: [PATCH 3/4] Cleanup. --- src/cpp/ripple/SerializedTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp/ripple/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h index 438145f38b..ac6cb98b20 100644 --- a/src/cpp/ripple/SerializedTypes.h +++ b/src/cpp/ripple/SerializedTypes.h @@ -312,7 +312,7 @@ public: void setValue(const STAmount &); virtual bool isEquivalent(const SerializedType& t) const; - virtual bool isDefault() const { return mValue == 0 && mIssuer.isZero() && mCurrency.isZero(); } + virtual bool isDefault() const { return (mValue == 0) && mIssuer.isZero() && mCurrency.isZero(); } bool operator==(const STAmount&) const; bool operator!=(const STAmount&) const; From 6e2bbaf2e7b2413864a8542c834bae8829ed0978 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 22 Nov 2012 12:25:17 -0800 Subject: [PATCH 4/4] Fix missing metadata bug. --- src/cpp/ripple/FieldNames.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp/ripple/FieldNames.h b/src/cpp/ripple/FieldNames.h index 507a2bd7f3..cec031d8d8 100644 --- a/src/cpp/ripple/FieldNames.h +++ b/src/cpp/ripple/FieldNames.h @@ -46,7 +46,7 @@ public: static const int sMD_DeleteFinal = 0x04; // final value when it is deleted static const int sMD_Create = 0x08; // value when it's created static const int sMD_Always = 0x10; // value when node containing it is affected at all - static const int sMD_Default = sMD_ChangeOrig | sMD_ChangeNew | sMD_DeleteFinal; + static const int sMD_Default = sMD_ChangeOrig | sMD_ChangeNew | sMD_DeleteFinal | sMD_Create; protected: static std::map codeToField;