Merge pull request #98 from wowario/release-v0.3.1.0
compile fix for Ubuntu 18
This commit is contained in:
commit
ff3a667a90
|
@ -95,7 +95,7 @@ Dates are provided in the format YYYY-MM-DD.
|
|||
| ------------------------------ | -----------| ----------------- | ---------------------- | -------------------------- | ---------------------------------------------------------------------------------- |
|
||||
| 1 | 2018-04-01 | v7 | v0.1.0.0 | v0.1.0.0 | Cryptonight variant 1, ringsize >= 8, sorted inputs
|
||||
| 6969 | 2018-04-24 | v8 | v0.2.0.0 | v0.2.0.0 | Bulletproofs, LWMA difficulty algorithm, ringsize >= 10, reduce unlock to 4
|
||||
| 53666 | 2018-10-06 | v9 | v0.3.0.0 | v0.3.0.0 | Cryptonight variant 2, LWMA v2, ringsize = 22, XXX
|
||||
| 53666 | 2018-10-06 | v9 | v0.3.0.0 | v0.3.0.1 | Cryptonight variant 2, LWMA v2, ringsize = 22, XXX
|
||||
|
||||
X's indicate that these details have not been determined as of commit date.
|
||||
|
||||
|
|
|
@ -127,7 +127,7 @@ namespace cryptonote
|
|||
out_amounts[1] += out_amounts[0];
|
||||
for (size_t n = 1; n < out_amounts.size(); ++n)
|
||||
out_amounts[n - 1] = out_amounts[n];
|
||||
out_amounts.resize(out_amounts.size() - 1);
|
||||
out_amounts.pop_back();
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -661,7 +661,7 @@ bool t_command_parser_executor::sync_info(const std::vector<std::string>& args)
|
|||
|
||||
bool t_command_parser_executor::version(const std::vector<std::string>& args)
|
||||
{
|
||||
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << std::endl;
|
||||
std::cout << "Wownero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << std::endl;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -1560,7 +1560,7 @@ bool simple_wallet::save_known_rings(const std::vector<std::string> &args)
|
|||
|
||||
bool simple_wallet::version(const std::vector<std::string> &args)
|
||||
{
|
||||
message_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||
message_writer() << "Wownero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
|
||||
#define DEF_MONERO_VERSION "0.3.0.0-master"
|
||||
#define DEF_MONERO_VERSION "0.3.0.1-master"
|
||||
#define DEF_MONERO_RELEASE_NAME "Cool Cage"
|
||||
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
|
||||
|
||||
|
|
Loading…
Reference in New Issue