diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp index b7ffc6c..09a7c7c 100644 --- a/src/wallet/MoneroWalletModel.cpp +++ b/src/wallet/MoneroWalletModel.cpp @@ -382,6 +382,11 @@ namespace monero { return node; } + void MoneroOutputWallet::merge(const shared_ptr& self, const shared_ptr& other) { + cout << "MoneroOutputWallet::merge()" << endl; + throw runtime_error("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 c32d849..d71f65e 100644 --- a/src/wallet/MoneroWalletModel.h +++ b/src/wallet/MoneroWalletModel.h @@ -161,6 +161,7 @@ namespace monero { boost::optional isFrozen; boost::property_tree::ptree toPropertyTree() const; + void merge(const shared_ptr& self, const shared_ptr& other); }; /**