From 22cdc4c9b6c5d62f85ad756f64b067f9d1e99fdb Mon Sep 17 00:00:00 2001 From: woodser Date: Tue, 3 Dec 2019 19:33:42 -0500 Subject: [PATCH] m_version_number -> m_number --- src/daemon/monero_daemon_model.cpp | 2 +- src/daemon/monero_daemon_model.h | 2 +- src/wallet/monero_wallet.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/daemon/monero_daemon_model.cpp b/src/daemon/monero_daemon_model.cpp index 0759d73..8a49225 100644 --- a/src/daemon/monero_daemon_model.cpp +++ b/src/daemon/monero_daemon_model.cpp @@ -97,7 +97,7 @@ namespace monero { // set num values rapidjson::Value value_num(rapidjson::kNumberType); - if (m_version_number != boost::none) monero_utils::addJsonMember("versionNumber", m_version_number.get(), allocator, root, value_num); + if (m_number != boost::none) monero_utils::addJsonMember("versionNumber", m_number.get(), allocator, root, value_num); // set bool values if (m_is_release != boost::none) monero_utils::addJsonMember("isRelease", m_is_release.get(), allocator, root); diff --git a/src/daemon/monero_daemon_model.h b/src/daemon/monero_daemon_model.h index e766a27..f112ae7 100644 --- a/src/daemon/monero_daemon_model.h +++ b/src/daemon/monero_daemon_model.h @@ -99,7 +99,7 @@ namespace monero { * Models a Monero version. */ struct monero_version : public serializable_struct { - boost::optional m_version_number; + boost::optional m_number; boost::optional m_is_release; rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const; diff --git a/src/wallet/monero_wallet.cpp b/src/wallet/monero_wallet.cpp index 9b11e27..3d48c3e 100644 --- a/src/wallet/monero_wallet.cpp +++ b/src/wallet/monero_wallet.cpp @@ -987,7 +987,7 @@ namespace monero { monero_version monero_wallet::get_version() const { monero_version version; - version.m_version_number = 65552; // same as monero-wallet-rpc v0.15.0.1 release + version.m_number = 65552; // same as monero-wallet-rpc v0.15.0.1 release version.m_is_release = false; // TODO: could pull from MONERO_VERSION_IS_RELEASE in version.cpp return version; }