diff options
| author | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2017-01-27 17:43:41 +0900 |
|---|---|---|
| committer | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2017-01-27 18:13:20 +0900 |
| commit | b7b48c8bbdf7a90861610b035d8b0a247ef78c45 (patch) | |
| tree | 76e6ff7c7547127960ff5e603da95b669cbfdb26 /src/merkleblock.cpp | |
| parent | 9b4d2673b7757fd242b13c972c73897c92a90ce1 (diff) | |
| download | bitcoin-b7b48c8bbdf7a90861610b035d8b0a247ef78c45.tar.xz | |
Refactor: Remove using namespace <xxx> from src/*.cpp.
Diffstat (limited to 'src/merkleblock.cpp')
| -rw-r--r-- | src/merkleblock.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index 86c8172a31..e3f3e4621a 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -9,14 +9,12 @@ #include "consensus/consensus.h" #include "utilstrencodings.h" -using namespace std; - CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter) { header = block.GetBlockHeader(); - vector<bool> vMatch; - vector<uint256> vHashes; + std::vector<bool> vMatch; + std::vector<uint256> vHashes; vMatch.reserve(block.vtx.size()); vHashes.reserve(block.vtx.size()); @@ -27,7 +25,7 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter) if (filter.IsRelevantAndUpdate(*block.vtx[i])) { vMatch.push_back(true); - vMatchedTxn.push_back(make_pair(i, hash)); + vMatchedTxn.push_back(std::make_pair(i, hash)); } else vMatch.push_back(false); @@ -41,8 +39,8 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, const std::set<uint256>& txids) { header = block.GetBlockHeader(); - vector<bool> vMatch; - vector<uint256> vHashes; + std::vector<bool> vMatch; + std::vector<uint256> vHashes; vMatch.reserve(block.vtx.size()); vHashes.reserve(block.vtx.size()); |