Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

compile errors fixed when DEBUG_CREATE_BLOCK_TEMPLATE defined

Browse Source
This commit is contained in:
rckngOpossum 2016-09-15 15:36:16 -05:00
parent 7c899ec33a
commit e49c161987
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/blockchain.cpp
View File

@ -1105,7 +1105,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
} }
else else
{ {
if (cur_tx.fee != cur_tx.tx.txnFee) if (cur_tx.fee != cur_tx.tx.rct_signatures.txnFee)
{ {
LOG_ERROR("Creating block template: error: invalid fee"); LOG_ERROR("Creating block template: error: invalid fee");
} }

2
src/cryptonote_core/cryptonote_format_utils.cpp
View File

@ -129,7 +129,7 @@ namespace cryptonote
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE) #if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
LOG_PRINT_L1("Creating block template: reward " << block_reward << LOG_PRINT_L1("Creating block template: reward " << block_reward <<
", fee " << fee) ", fee " << fee);
#endif #endif
block_reward += fee; block_reward += fee;

6
src/cryptonote_core/tx_pool.h
View File

@ -455,8 +455,14 @@ namespace cryptonote
*/ */
typedef std::unordered_map<crypto::key_image, std::unordered_set<crypto::hash> > key_images_container; typedef std::unordered_map<crypto::key_image, std::unordered_set<crypto::hash> > key_images_container;
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
public:
#endif
mutable epee::critical_section m_transactions_lock; //!< lock for the pool mutable epee::critical_section m_transactions_lock; //!< lock for the pool
transactions_container m_transactions; //!< container for transactions in the pool transactions_container m_transactions; //!< container for transactions in the pool
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
private:
#endif
//! container for spent key images from the transactions in the pool //! container for spent key images from the transactions in the pool
key_images_container m_spent_key_images; key_images_container m_spent_key_images;