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

use derived classes where appropriate

Browse Source
This commit is contained in:
woodser
2019-06-17 15:17:55 -04:00
parent 911d3cb4d4
commit 6c8c9ae911
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/MoneroDaemonModel.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ namespace monero {
powHash = MoneroUtils::reconcile(powHash, other->powHash);
}
void MoneroBlock::merge(const shared_ptr<MoneroBlockHeader>& self, const shared_ptr<MoneroBlockHeader>& other) {
void MoneroBlock::merge(const shared_ptr<MoneroBlock>& self, const shared_ptr<MoneroBlock>& other) {
cout << "MoneroBlock::merge()" << endl;
if (this != &*self) throw runtime_error("this != self");
if (self == other) return;
src/daemon/MoneroDaemonModel.h
+1 -1
View File
@@ -95,7 +95,7 @@ namespace monero {
vector<string> txIds;
boost::property_tree::ptree toPropertyTree() const;
void merge(const shared_ptr<MoneroBlockHeader>& self, const shared_ptr<MoneroBlockHeader>& other);
void merge(const shared_ptr<MoneroBlock>& self, const shared_ptr<MoneroBlock>& other);
};
/**