diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-22 11:48:39 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-22 11:48:39 -0500 |
| commit | a3de797e5778b189f3e18877516ab8a72563badf (patch) | |
| tree | 0f62ec7fccc9f31b36a3996873043addee9f25fa /src/cryptonote_core/cryptonote_core.cpp | |
| parent | add98edfc32ce402dd092a913e35ab9c91aec374 (diff) | |
| parent | b70ab128fceeeb1e193f349f6a4ebb2af4df1a8d (diff) | |
| download | monzero-core-a3de797e5778b189f3e18877516ab8a72563badf.tar.gz monzero-core-a3de797e5778b189f3e18877516ab8a72563badf.tar.xz monzero-core-a3de797e5778b189f3e18877516ab8a72563badf.zip | |
Merge pull request #1610
b70ab128 rpc: fix orphan_status when getting blocks (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/cryptonote_core.cpp')
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 5be25a410..c8103d720 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -989,9 +989,9 @@ namespace cryptonote return m_blockchain_storage.get_block_id_by_height(height); } //----------------------------------------------------------------------------------------------- - bool core::get_block_by_hash(const crypto::hash &h, block &blk) const + bool core::get_block_by_hash(const crypto::hash &h, block &blk, bool *orphan) const { - return m_blockchain_storage.get_block_by_hash(h, blk); + return m_blockchain_storage.get_block_by_hash(h, blk, orphan); } //----------------------------------------------------------------------------------------------- std::string core::print_pool(bool short_format) const |