diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-09-25 22:27:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-09-25 22:27:44 +0200 |
| commit | 29d601563fff1a23fa5c21de8c455d542b1adfe3 (patch) | |
| tree | 4a071ec0ef979f020a2cf567973e02087494e8b9 /src/cryptonote_protocol/block_queue.cpp | |
| parent | 85f4b600d26ed71c9a303828ea966547f5296492 (diff) | |
| parent | 36c3465b9870bafee3c7f30b423d7b975c97b63f (diff) | |
| download | monzero-core-29d601563fff1a23fa5c21de8c455d542b1adfe3.tar.gz monzero-core-29d601563fff1a23fa5c21de8c455d542b1adfe3.tar.xz monzero-core-29d601563fff1a23fa5c21de8c455d542b1adfe3.zip | |
Merge pull request #2434
36c3465b wallet2: do not keep block hashes below last checkpoint (moneromooo-monero)
cdbbe99c checkpoints: add a token checkpoint on testnet (the genesis block) (moneromooo-monero)
493fad80 serialization: add deque serialization (moneromooo-monero)
fa54b205 fix typo in basic and core CMakeLists.txt (moneromooo-monero)
5d65a75b move checkpoints in a separate library (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_protocol/block_queue.cpp')
| -rw-r--r-- | src/cryptonote_protocol/block_queue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_protocol/block_queue.cpp b/src/cryptonote_protocol/block_queue.cpp index 02a8e3ec2..64dd1fb50 100644 --- a/src/cryptonote_protocol/block_queue.cpp +++ b/src/cryptonote_protocol/block_queue.cpp @@ -340,7 +340,7 @@ size_t block_queue::get_num_filled_spans() const crypto::hash block_queue::get_last_known_hash(const boost::uuids::uuid &connection_id) const { boost::unique_lock<boost::recursive_mutex> lock(mutex); - crypto::hash hash = cryptonote::null_hash; + crypto::hash hash = crypto::null_hash; uint64_t highest_height = 0; for (const auto &span: blocks) { |