github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-21 17:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

transfers override merge

Browse Source
This commit is contained in:
woodser
2019-07-03 17:25:54 -04:00
parent c019a0c36b
commit 1a48d7ba0b
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/MoneroDaemonModel.h
+1 -1
View File
@@ -145,7 +145,7 @@ namespace monero {
boost::property_tree::ptree toPropertyTree() const;
boost::optional<uint64_t> getHeight() const;
virtual void merge(const shared_ptr<MoneroTx>& self, const shared_ptr<MoneroTx>& other) ;
virtual void merge(const shared_ptr<MoneroTx>& self, const shared_ptr<MoneroTx>& other);
};
/**
src/wallet/MoneroWalletModel.cpp
+8
View File
@@ -253,6 +253,10 @@ namespace monero {
return node;
}
void MoneroIncomingTransfer::merge(const shared_ptr<MoneroTransfer>& self, const shared_ptr<MoneroTransfer>& other) {
merge(static_pointer_cast<MoneroIncomingTransfer>(self), static_pointer_cast<MoneroIncomingTransfer>(other));
}
void MoneroIncomingTransfer::merge(const shared_ptr<MoneroIncomingTransfer>& self, const shared_ptr<MoneroIncomingTransfer>& other) {
cout << "MoneroIncomingTransfer::merge" << endl;
throw runtime_error("Not implemented");
@@ -271,6 +275,10 @@ namespace monero {
return node;
}
void MoneroOutgoingTransfer::merge(const shared_ptr<MoneroTransfer>& self, const shared_ptr<MoneroTransfer>& other) {
merge(static_pointer_cast<MoneroOutgoingTransfer>(self), static_pointer_cast<MoneroOutgoingTransfer>(other));
}
void MoneroOutgoingTransfer::merge(const shared_ptr<MoneroOutgoingTransfer>& self, const shared_ptr<MoneroOutgoingTransfer>& other) {
cout << "MoneroIncomingTransfer::merge" << endl;
throw runtime_error("Not implemented");
src/wallet/MoneroWalletModel.h
+2
View File
@@ -114,6 +114,7 @@ namespace monero {
boost::optional<bool> getIsIncoming() const;
boost::property_tree::ptree toPropertyTree() const;
void merge(const shared_ptr<MoneroTransfer>& self, const shared_ptr<MoneroTransfer>& other);
void merge(const shared_ptr<MoneroIncomingTransfer>& self, const shared_ptr<MoneroIncomingTransfer>& other);
};
@@ -127,6 +128,7 @@ namespace monero {
boost::optional<bool> getIsIncoming() const;
boost::property_tree::ptree toPropertyTree() const;
void merge(const shared_ptr<MoneroTransfer>& self, const shared_ptr<MoneroTransfer>& other);
void merge(const shared_ptr<MoneroOutgoingTransfer>& self, const shared_ptr<MoneroOutgoingTransfer>& other);
};