aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-01-10 01:30:35 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2019-01-10 01:58:33 +0100
commit7fa238c701b5b6d4f78b92334e38fac466ec0eb2 (patch)
treec1fbbaa92b7f118279a4fd684f055afb65b023b5 /src/merkleblock.cpp
parent5da08e0ac51682376767d823e76d2a92c61a5d97 (diff)
downloadbitcoin-7fa238c701b5b6d4f78b92334e38fac466ec0eb2.tar.xz
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.
Diffstat (limited to 'src/merkleblock.cpp')
-rw-r--r--src/merkleblock.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index 0c37bab1f8..a54268d655 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -53,7 +53,7 @@ uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::ve
else
right = left;
// 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;
}
// 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());
}
}