From 6c8c9ae9110568e4520b6719359bebdd789d47a6 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Mon, 17 Jun 2019 15:17:55 -0400
Subject: [PATCH] use derived classes where appropriate

---
 src/daemon/MoneroDaemonModel.cpp | 2 +-
 src/daemon/MoneroDaemonModel.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/daemon/MoneroDaemonModel.cpp b/src/daemon/MoneroDaemonModel.cpp
index 0ddeb6e..4d113cb 100644
--- a/src/daemon/MoneroDaemonModel.cpp
+++ b/src/daemon/MoneroDaemonModel.cpp
@@ -122,7 +122,7 @@ namespace monero {
     powHash = MoneroUtils::reconcile(powHash, other->powHash);
   }
 
-  void MoneroBlock::merge(const shared_ptr<MoneroBlockHeader>& self, const shared_ptr<MoneroBlockHeader>& other) {
+  void MoneroBlock::merge(const shared_ptr<MoneroBlock>& self, const shared_ptr<MoneroBlock>& other) {
     cout << "MoneroBlock::merge()" << endl;
     if (this != &*self) throw runtime_error("this != self");
     if (self == other) return;
diff --git a/src/daemon/MoneroDaemonModel.h b/src/daemon/MoneroDaemonModel.h
index d9f453b..005ad42 100644
--- a/src/daemon/MoneroDaemonModel.h
+++ b/src/daemon/MoneroDaemonModel.h
@@ -95,7 +95,7 @@ namespace monero {
     vector<string> txIds;
 
     boost::property_tree::ptree toPropertyTree() const;
-    void merge(const shared_ptr<MoneroBlockHeader>& self, const shared_ptr<MoneroBlockHeader>& other);
+    void merge(const shared_ptr<MoneroBlock>& self, const shared_ptr<MoneroBlock>& other);
   };
 
   /**