Replace use of BEGIN and END macros on uint256

Replace use of `BEGIN` and `END` macros on uint256 with `begin()` and
`end()` methods in the Merkle tree code.
This commit is contained in:
Wladimir J. van der Laan 2019-01-10 01:30:35 +01:00
parent 5da08e0ac5
commit 7fa238c701
2 changed files with 4 additions and 4 deletions

View file

@ -53,7 +53,7 @@ uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::ve
else else
right = left; right = left;
// combine subhashes // combine subhashes
return Hash(BEGIN(left), END(left), BEGIN(right), END(right)); return Hash(left.begin(), left.end(), right.begin(), right.end());
} }
} }
@ -109,7 +109,7 @@ uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, uns
right = left; right = left;
} }
// and combine them before returning // and combine them before returning
return Hash(BEGIN(left), END(left), BEGIN(right), END(right)); return Hash(left.begin(), left.end(), right.begin(), right.end());
} }
} }

View file

@ -13,9 +13,9 @@ static uint256 ComputeMerkleRootFromBranch(const uint256& leaf, const std::vecto
uint256 hash = leaf; uint256 hash = leaf;
for (std::vector<uint256>::const_iterator it = vMerkleBranch.begin(); it != vMerkleBranch.end(); ++it) { for (std::vector<uint256>::const_iterator it = vMerkleBranch.begin(); it != vMerkleBranch.end(); ++it) {
if (nIndex & 1) { if (nIndex & 1) {
hash = Hash(BEGIN(*it), END(*it), BEGIN(hash), END(hash)); hash = Hash(it->begin(), it->end(), hash.begin(), hash.end());
} else { } else {
hash = Hash(BEGIN(hash), END(hash), BEGIN(*it), END(*it)); hash = Hash(hash.begin(), hash.end(), it->begin(), it->end());
} }
nIndex >>= 1; nIndex >>= 1;
} }