gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-27 05:03:14 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4894

Browse Source 
aee7a4e3 wallet_rpc_server: do not use RPC data if the call failed (moneromooo-monero)
1a0733e5 windows_service: fix memory leak (moneromooo-monero)
0dac3c64 unit_tests: do not rethrow a copy of an exception (moneromooo-monero)
5d9915ab cryptonote: fix get_unit for non default settings (moneromooo-monero)
d4f50cb1 remove some unused code (moneromooo-monero)
61163971 a few minor (but easy) performance tweaks (moneromooo-monero)
30023074 tests: slow_memmem now returns size_t (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2018-12-04 17:33:18 +02:00
parent 6d1c2a9304 aee7a4e364
commit 81418cb281
30 changed files with 41 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_basic/cryptonote_format_utils.cpp
View File

@@ -882,7 +882,7 @@ namespace cryptonote
{
if (decimal_point == (unsigned int)-1)
decimal_point = default_decimal_point;
switch (std::atomic_load(&default_decimal_point))
switch (decimal_point)
{
case 12:
return "monero";
@@ -895,7 +895,7 @@ namespace cryptonote
case 0:
return "piconero";
default:
ASSERT_MES_AND_THROW("Invalid decimal point specification: " << default_decimal_point);
ASSERT_MES_AND_THROW("Invalid decimal point specification: " << decimal_point);
}
}
//---------------------------------------------------------------