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& self, const shared_ptr& other) { + merge(static_pointer_cast(self), static_pointer_cast(other)); + } + + void MoneroOutputWallet::merge(const shared_ptr& self, const shared_ptr& 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 isFrozen; boost::property_tree::ptree toPropertyTree() const; + void merge(const shared_ptr& self, const shared_ptr& other); + void merge(const shared_ptr& self, const shared_ptr& other); }; /**