From c21a9b17c58007260250c459b8fdf178d9d65816 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 24 Apr 2012 15:57:30 -0700 Subject: [PATCH 1/2] Format type. --- src/LedgerFormats.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LedgerFormats.cpp b/src/LedgerFormats.cpp index 429d05f53..ca833557a 100644 --- a/src/LedgerFormats.cpp +++ b/src/LedgerFormats.cpp @@ -9,7 +9,7 @@ LedgerEntryFormat LedgerFormats[]= { S_FIELD(Flags), STI_UINT32, SOE_FLAGS, 0 }, { S_FIELD(Account), STI_ACCOUNT, SOE_REQUIRED, 0 }, { S_FIELD(Sequence), STI_UINT32, SOE_REQUIRED, 0 }, - { S_FIELD(Balance), STI_AMOUNT, SOE_REQUIRED, 0 }, + { S_FIELD(Balance), STI_UINT64, SOE_REQUIRED, 0 }, { S_FIELD(LastReceive), STI_UINT32, SOE_REQUIRED, 0 }, { S_FIELD(LastTxn), STI_UINT32, SOE_REQUIRED, 0 }, { S_FIELD(EmailHash), STI_HASH128, SOE_IFFLAG, 1 }, From 4bb078f053c06261d64fbff298d7fbed70ca251b Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 24 Apr 2012 15:57:46 -0700 Subject: [PATCH 2/2] *_clone functions were in the wrong place. --- src/SerializedTypes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SerializedTypes.h b/src/SerializedTypes.h index 0a70f432c..2085a122a 100644 --- a/src/SerializedTypes.h +++ b/src/SerializedTypes.h @@ -46,8 +46,6 @@ public: virtual void add(Serializer& s) const { return; } - SerializedType* new_clone(const SerializedType& s) { return s.duplicate(); } - void delete_clone(const SerializedType* s) { boost::checked_delete(s); } virtual bool isEquivalent(const SerializedType& t) const { return true; } @@ -57,6 +55,9 @@ public: { return (getSType()!=t.getSType()) || !isEquivalent(t); } }; +inline SerializedType* new_clone(const SerializedType& s) { return s.duplicate(); } +inline void delete_clone(const SerializedType* s) { boost::checked_delete(s); } + class STUInt8 : public SerializedType { protected: