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

cleanup

Browse Source
This commit is contained in:
woodser
2019-07-08 11:44:27 -04:00
parent 6c0e2cacfe
commit 74b5cbe708
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/MoneroDaemonModel.cpp
-3
View File
@@ -149,7 +149,6 @@ namespace monero {
}
void MoneroBlock::merge(const shared_ptr<MoneroBlock>& self, const shared_ptr<MoneroBlock>& other) {
cout << "MoneroBlock::merge()" << endl;
if (this != self.get()) throw runtime_error("this != self");
if (self == other) return;
@@ -224,9 +223,7 @@ namespace monero {
}
void MoneroTx::merge(const shared_ptr<MoneroTx>& self, const shared_ptr<MoneroTx>& other) {
cout << "MoneroTx::merge()" << endl;
if (this != self.get()) throw runtime_error("this != self");
cout << self << ", " << other << endl;
if (self == other) return;
// merge blocks if they're different which comes back to merging txs
src/wallet/MoneroWalletModel.cpp
-2
View File
@@ -128,12 +128,10 @@ namespace monero {
}
void MoneroTxWallet::merge(const shared_ptr<MoneroTx>& self, const shared_ptr<MoneroTx>& other) {
cout << "MoneroTxWallet::merge(MoneroTxs)" << endl;
merge(static_pointer_cast<MoneroTxWallet>(self), static_pointer_cast<MoneroTxWallet>(other));
}
void MoneroTxWallet::merge(const shared_ptr<MoneroTxWallet>& self, const shared_ptr<MoneroTxWallet>& other) {
cout << "MoneroTxWallet::merge()" << endl;
if (this != self.get()) throw runtime_error("this != self");
if (self == other) return;