diff options
| author | MarcoFalke <[email protected]> | 2017-01-30 13:13:07 +0100 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2017-01-30 13:13:20 +0100 |
| commit | 668de70be039a4f1ffcf20aeae2a22ee71fc55a8 (patch) | |
| tree | e6baaf60d95d75452af3ebacd57da5479d4a3ebd /src/merkleblock.cpp | |
| parent | Merge #9626: Clean up a few CConnman cs_vNodes/CNode things (diff) | |
| parent | Refactor: Remove using namespace <xxx> from src/*.cpp. (diff) | |
| download | discoin-668de70be039a4f1ffcf20aeae2a22ee71fc55a8.tar.xz discoin-668de70be039a4f1ffcf20aeae2a22ee71fc55a8.zip | |
Merge #9644: [refactor] Remove using namespace <xxx> from src/
b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)
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 86c8172a3..e3f3e4621 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()); |