compiling with daemon model merge definition

This commit is contained in:
woodser
2019-06-11 13:18:52 -04:00
parent 3757513f62
commit d43b2d5479
3 changed files with 17 additions and 3 deletions
+11
View File
@@ -98,6 +98,17 @@ namespace monero {
// -------------------------- MODEL IMPLEMENTATION --------------------------
void MoneroBlockHeader::merge(const MoneroBlockHeader& header) {
throw runtime_error("Not implemented");
}
void MoneroBlock::merge(const MoneroBlock& block) {
throw runtime_error("Not implemented");
}
void MoneroTx::merge(const MoneroTx& tx) {
throw runtime_error("Not implemented");
}
// ---------------------------- PRIVATE HELPERS -----------------------------
+3
View File
@@ -82,6 +82,7 @@ namespace monero {
boost::optional<string> powHash;
boost::property_tree::ptree toPropertyTree() const;
void merge(const MoneroBlockHeader& header);
};
/**
@@ -94,6 +95,7 @@ namespace monero {
vector<string> txIds;
boost::property_tree::ptree toPropertyTree() const;
void merge(const MoneroBlock& block);
};
/**
@@ -145,6 +147,7 @@ namespace monero {
if (block == boost::none) return boost::none;
return *((*block)->height);
}
void merge(const MoneroTx& tx);
};
/**