diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-16 08:42:26 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-16 08:42:26 +0200 |
| commit | c2f15e966c56ffe0c7a5aab90c96f924809b39bf (patch) | |
| tree | f91368b4c27b3934f357aab3fcc8ca180a484f6c /src/cryptonote_core/tx_pool.h | |
| parent | Merge pull request #1074 (diff) | |
| parent | compile errors fixed when PER_BLOCK_CHECKPOINT not defined (diff) | |
| download | monero-c2f15e966c56ffe0c7a5aab90c96f924809b39bf.tar.xz | |
Merge pull request #1076
e29e8b1 compile errors fixed when PER_BLOCK_CHECKPOINT not defined (rckngOpossum)
e49c161 compile errors fixed when DEBUG_CREATE_BLOCK_TEMPLATE defined (rckngOpossum)
Diffstat (limited to 'src/cryptonote_core/tx_pool.h')
| -rw-r--r-- | src/cryptonote_core/tx_pool.h | 6 |
1 files changed, 6 insertions, 0 deletions
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; |