Merge pull request #6921

f1836ac cryptonote_core: Fix missing override warnings (Nathan Dorfman)
This commit is contained in:
luigi1111 2020-11-29 01:39:17 -06:00
commit bab4495cfb
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 2 deletions

View File

@ -224,14 +224,14 @@ namespace cryptonote
* *
* @return true if the block was added to the main chain, otherwise false * @return true if the block was added to the main chain, otherwise false
*/ */
virtual bool handle_block_found(block& b, block_verification_context &bvc); virtual bool handle_block_found(block& b, block_verification_context &bvc) override;
/** /**
* @copydoc Blockchain::create_block_template * @copydoc Blockchain::create_block_template
* *
* @note see Blockchain::create_block_template * @note see Blockchain::create_block_template
*/ */
virtual bool get_block_template(block& b, const account_public_address& adr, difficulty_type& diffic, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce, uint64_t &seed_height, crypto::hash &seed_hash); virtual bool get_block_template(block& b, const account_public_address& adr, difficulty_type& diffic, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce, uint64_t &seed_height, crypto::hash &seed_hash) override;
virtual bool get_block_template(block& b, const crypto::hash *prev_block, const account_public_address& adr, difficulty_type& diffic, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce, uint64_t &seed_height, crypto::hash &seed_hash); virtual bool get_block_template(block& b, const crypto::hash *prev_block, const account_public_address& adr, difficulty_type& diffic, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce, uint64_t &seed_height, crypto::hash &seed_hash);
/** /**