diff options
author | luigi1111 <luigi1111w@gmail.com> | 2019-08-14 15:31:52 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2019-08-14 15:31:52 -0500 |
commit | 564bb1da3a760834e306906a78301e3be93d9836 (patch) | |
tree | 801f83e7f9ace634c47b403eddac2a2b6762ff87 /src/cryptonote_core/blockchain.cpp | |
parent | Merge pull request #5498 (diff) | |
parent | daemon: add more chain specific info in alt_chain_info (diff) | |
download | monero-564bb1da3a760834e306906a78301e3be93d9836.tar.xz |
Merge pull request #5525
0605406 daemon: sort alt chains by height (moneromooo-monero)
4228ee0 daemon: add optional arguments to alt_chain_info (moneromooo-monero)
880ebfd daemon: add more chain specific info in alt_chain_info (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
-rw-r--r-- | src/cryptonote_core/blockchain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 7d173b2ff..0ea81f19a 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4853,9 +4853,9 @@ std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> Blockchain:: get_ou return m_db->get_output_histogram(amounts, unlocked, recent_cutoff, min_count); } -std::list<std::pair<Blockchain::block_extended_info,std::vector<crypto::hash>>> Blockchain::get_alternative_chains() const +std::vector<std::pair<Blockchain::block_extended_info,std::vector<crypto::hash>>> Blockchain::get_alternative_chains() const { - std::list<std::pair<Blockchain::block_extended_info,std::vector<crypto::hash>>> chains; + std::vector<std::pair<Blockchain::block_extended_info,std::vector<crypto::hash>>> chains; blocks_ext_by_hash alt_blocks; alt_blocks.reserve(m_db->get_alt_block_count()); |