diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-01-30 13:13:07 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-01-30 13:13:20 +0100 |
commit | 668de70be039a4f1ffcf20aeae2a22ee71fc55a8 (patch) | |
tree | e6baaf60d95d75452af3ebacd57da5479d4a3ebd /src/miner.cpp | |
parent | 36966a1c0e6415964008c679c1a01d9883486e87 (diff) | |
parent | b7b48c8bbdf7a90861610b035d8b0a247ef78c45 (diff) | |
download | bitcoin-668de70be039a4f1ffcf20aeae2a22ee71fc55a8.tar.xz |
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/miner.cpp')
-rw-r--r-- | src/miner.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index acded94168..d01edd93b5 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -31,8 +31,6 @@ #include <queue> #include <utility> -using namespace std; - ////////////////////////////////////////////////////////////////////////////// // // BitcoinMiner @@ -500,7 +498,7 @@ void BlockAssembler::addPackageTxs() } // Package can be added. Sort the entries in a valid order. - vector<CTxMemPool::txiter> sortedEntries; + std::vector<CTxMemPool::txiter> sortedEntries; SortForBlock(ancestors, iter, sortedEntries); for (size_t i=0; i<sortedEntries.size(); ++i) { @@ -529,7 +527,7 @@ void BlockAssembler::addPriorityTxs() fNeedSizeAccounting = true; // This vector will be sorted into a priority queue: - vector<TxCoinAgePriority> vecPriority; + std::vector<TxCoinAgePriority> vecPriority; TxCoinAgePriorityCompare pricomparer; std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash> waitPriMap; typedef std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash>::iterator waitPriIter; |