aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-03-05 13:46:35 +0200
committerRiccardo Spagni <ric@spagni.net>2019-03-05 13:46:35 +0200
commit082149c580e1699e334dd601f38f3efad3a4670a (patch)
tree972619f04dad8bcd34545b113883ce7d524d1219 /src/cryptonote_core
parentupdate checkpoints hash (diff)
downloadmonero-082149c580e1699e334dd601f38f3efad3a4670a.tar.xz
fix merge errors, update recommended version to 0.14.0.2
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/blockchain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index ffd160aed..3bc4b2c2c 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -4698,7 +4698,7 @@ void Blockchain::cancel()
#if defined(PER_BLOCK_CHECKPOINT)
static const char expected_block_hashes_hash[] = "570ce2357b08fadac6058e34f95c5e08323f9325de260d07b091a281a948a7b0";
-void Blockchain::load_compiled_in_block_hashes()
+void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
{
if (get_checkpoints == nullptr || !m_fast_sync)
{