output wallet merge placeholder

This commit is contained in:
woodser
2019-07-15 22:09:21 -04:00
parent 7bb7f78349
commit 73d24f4c47
2 changed files with 10 additions and 0 deletions
+8
View File
@@ -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 {
+2
View File
@@ -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);
};
/**