From 73d24f4c472c710c38cd58247a617dc554ab563e Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Mon, 15 Jul 2019 22:09:21 -0400
Subject: [PATCH] output wallet merge placeholder

---
 src/wallet/MoneroWalletModel.cpp | 8 ++++++++
 src/wallet/MoneroWalletModel.h   | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp
index f0e3727..f36c80d 100644
--- a/src/wallet/MoneroWalletModel.cpp
+++ b/src/wallet/MoneroWalletModel.cpp
@@ -468,6 +468,14 @@ namespace monero {
     return node;
   }
 
+  void MoneroOutputWallet::merge(const shared_ptr<MoneroOutput>& self, const shared_ptr<MoneroOutput>& other) {
+    merge(static_pointer_cast<MoneroOutputWallet>(self), static_pointer_cast<MoneroOutputWallet>(other));
+  }
+
+  void MoneroOutputWallet::merge(const shared_ptr<MoneroOutputWallet>& self, const shared_ptr<MoneroOutputWallet>& other) {
+    throw runtime_error("MoneroOutputWallet::merge(self, other) not implemented");
+  }
+
   // ------------------------ MONERO OUTPUT REQUEST ---------------------------
 
   boost::property_tree::ptree MoneroOutputRequest::toPropertyTree() const {
diff --git a/src/wallet/MoneroWalletModel.h b/src/wallet/MoneroWalletModel.h
index 1226ac9..0805043 100644
--- a/src/wallet/MoneroWalletModel.h
+++ b/src/wallet/MoneroWalletModel.h
@@ -215,6 +215,8 @@ namespace monero {
     boost::optional<bool> isFrozen;
 
     boost::property_tree::ptree toPropertyTree() const;
+    void merge(const shared_ptr<MoneroOutput>& self, const shared_ptr<MoneroOutput>& other);
+    void merge(const shared_ptr<MoneroOutputWallet>& self, const shared_ptr<MoneroOutputWallet>& other);
   };
 
   /**