aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrckngOpossum <rckngOpossum@@users.noreply.github.com>2016-09-15 15:36:16 -0500
committerrckngOpossum <rckngOpossum@@users.noreply.github.com>2016-09-15 15:36:16 -0500
commite49c161987d6f9c8fecc8e5f96f065d8686e53a7 (patch)
tree1ef71f1fff6608f7d22a35b3afc5002779a33599
parentMerge pull request #1074 (diff)
downloadmonero-e49c161987d6f9c8fecc8e5f96f065d8686e53a7.tar.xz
compile errors fixed when DEBUG_CREATE_BLOCK_TEMPLATE defined
-rw-r--r--src/cryptonote_core/blockchain.cpp2
-rw-r--r--src/cryptonote_core/cryptonote_format_utils.cpp2
-rw-r--r--src/cryptonote_core/tx_pool.h6
3 files changed, 8 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index b15eb4b90..cbc2315c6 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -1105,7 +1105,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
}
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");
}
diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp
index 9667006a3..d1ccfc7d1 100644
--- a/src/cryptonote_core/cryptonote_format_utils.cpp
+++ b/src/cryptonote_core/cryptonote_format_utils.cpp
@@ -129,7 +129,7 @@ namespace cryptonote
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
LOG_PRINT_L1("Creating block template: reward " << block_reward <<
- ", fee " << fee)
+ ", fee " << fee);
#endif
block_reward += fee;
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h
index 0e280872d..794b86719 100644
--- a/src/cryptonote_core/tx_pool.h
+++ b/src/cryptonote_core/tx_pool.h
@@ -455,8 +455,14 @@ namespace cryptonote
*/
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
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
key_images_container m_spent_key_images;