diff options
| author | kenshi84 <kenshi84@protonmail.ch> | 2017-03-10 10:20:38 +0900 |
|---|---|---|
| committer | kenshi84 <kenshi84@protonmail.ch> | 2017-03-10 11:22:39 +0900 |
| commit | 7d07c64fe59846b20b1e322881c1ead2fe78460d (patch) | |
| tree | d8e49fa7cc68b84e46b59c203fcbedbf9e95a3cd /src/blockchain_db | |
| parent | Merge pull request #1852 (diff) | |
| download | monero-7d07c64fe59846b20b1e322881c1ead2fe78460d.tar.xz | |
fix dependency: put HardFork back to cryptonote_basic, made some BlockchainDB functions virtual again to avoid missing symbols error
Diffstat (limited to 'src/blockchain_db')
| -rw-r--r-- | src/blockchain_db/blockchain_db.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/blockchain_db/blockchain_db.h b/src/blockchain_db/blockchain_db.h index 674b844c1..f5710550b 100644 --- a/src/blockchain_db/blockchain_db.h +++ b/src/blockchain_db/blockchain_db.h @@ -37,7 +37,7 @@ #include "cryptonote_protocol/blobdatatype.h" #include "cryptonote_basic/cryptonote_basic.h" #include "cryptonote_basic/difficulty.h" -#include "cryptonote_core/hardfork.h" +#include "cryptonote_basic/hardfork.h" /** \file * Cryptonote Blockchain Database Interface @@ -768,7 +768,7 @@ public: * * @return the block requested */ - block get_block(const crypto::hash& h) const; + virtual block get_block(const crypto::hash& h) const; /** * @brief gets the height of the block with a given hash @@ -821,7 +821,7 @@ public: * * @return the block */ - block get_block_from_height(const uint64_t& height) const; + virtual block get_block_from_height(const uint64_t& height) const; /** * @brief fetch a block's timestamp @@ -1041,7 +1041,7 @@ public: * * @return the transaction with the given hash */ - transaction get_tx(const crypto::hash& h) const; + virtual transaction get_tx(const crypto::hash& h) const; /** * @brief fetches the transaction with the given hash @@ -1052,7 +1052,7 @@ public: * * @return true iff the transaction was found */ - bool get_tx(const crypto::hash& h, transaction &tx) const; + virtual bool get_tx(const crypto::hash& h, transaction &tx) const; /** * @brief fetches the transaction blob with the given hash |