diff --git a/src/SerializedTypes.h b/src/SerializedTypes.h index d7df1d1b71..fadc452e07 100644 --- a/src/SerializedTypes.h +++ b/src/SerializedTypes.h @@ -36,13 +36,11 @@ protected: SField::ptr fName; virtual SerializedType* duplicate() const { return new SerializedType(*fName); } - SerializedType(SField::ptr n) : fName(n) { assert(fName); } public: SerializedType() : fName(&sfGeneric) { ; } SerializedType(SField::ref n) : fName(&n) { assert(fName); } - SerializedType(const SerializedType& n) : fName(n.fName) { ; } virtual ~SerializedType() { ; } static std::auto_ptr deserialize(SField::ref name) diff --git a/src/TransactionMeta.cpp b/src/TransactionMeta.cpp index 30117e1e7f..068329b8e9 100644 --- a/src/TransactionMeta.cpp +++ b/src/TransactionMeta.cpp @@ -31,6 +31,7 @@ bool TransactionMetaSet::isNodeAffected(const uint256& node) const STObject& TransactionMetaSet::getAffectedNode(const uint256& node, SField::ref type, bool overrideType) { + assert(&type); for (STArray::iterator it = mNodes.begin(); it != mNodes.end(); ++it) { if (it->getFieldH256(sfLedgerIndex) == node) @@ -47,7 +48,7 @@ STObject& TransactionMetaSet::getAffectedNode(const uint256& node, SField::ref t assert(obj.getFName() == type); obj.setFieldH256(sfLedgerIndex, node); - return mNodes.back(); + return obj; } const STObject& TransactionMetaSet::peekAffectedNode(const uint256& node) const