diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-04-07 17:56:18 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-04-07 17:56:18 -0400 |
| commit | a8bc7182eaa39d8be61f5e2ed9d98184e5820f17 (patch) | |
| tree | 08c5e2f911d2726662470dae48c53f5c17aa1e50 /src/cryptonote_core/cryptonote_core.h | |
| parent | updated unbound cmake for static builds (diff) | |
| parent | Merges PR #37 (diff) | |
| download | monero-a8bc7182eaa39d8be61f5e2ed9d98184e5820f17.tar.xz | |
Merge BlockchainDB into upstream
Diffstat (limited to 'src/cryptonote_core/cryptonote_core.h')
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h index bb53ecb81..973f01272 100644 --- a/src/cryptonote_core/cryptonote_core.h +++ b/src/cryptonote_core/cryptonote_core.h @@ -39,7 +39,11 @@ #include "cryptonote_protocol/cryptonote_protocol_handler_common.h" #include "storages/portable_storage_template_helper.h" #include "tx_pool.h" +#if BLOCKCHAIN_DB == DB_LMDB +#include "blockchain.h" +#else #include "blockchain_storage.h" +#endif #include "miner.h" #include "connection_context.h" #include "cryptonote_core/cryptonote_stat_info.h" @@ -118,7 +122,11 @@ namespace cryptonote bool get_random_outs_for_amounts(const COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::request& req, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::response& res); void pause_mine(); void resume_mine(); +#if BLOCKCHAIN_DB == DB_LMDB + Blockchain& get_blockchain_storage(){return m_blockchain_storage;} +#else blockchain_storage& get_blockchain_storage(){return m_blockchain_storage;} +#endif //debug functions void print_blockchain(uint64_t start_index, uint64_t end_index); void print_blockchain_index(); @@ -159,7 +167,11 @@ namespace cryptonote uint64_t m_test_drop_download_height = 0; tx_memory_pool m_mempool; +#if BLOCKCHAIN_DB == DB_LMDB + Blockchain m_blockchain_storage; +#else blockchain_storage m_blockchain_storage; +#endif i_cryptonote_protocol* m_pprotocol; epee::critical_section m_incoming_tx_lock; //m_miner and m_miner_addres are probably temporary here |