Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-09 00:21:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10033

Browse Source 
681fee1 wallet: fix warning in fee priority algorithm (0xFFFC0000)
This commit is contained in:
tobtoht 2025-08-21 16:24:52 +00:00
commit d5514ab6ee
No known key found for this signature in database
GPG Key ID: E45B10DD027D2472
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/fee_algorithm.h
View File

@ -13,7 +13,7 @@ namespace tools
namespace fee_algorithm_utilities namespace fee_algorithm_utilities
{ {
static int as_integral(const fee_algorithm algorithm) inline int as_integral(const fee_algorithm algorithm)
{ {
return static_cast<int>(algorithm); return static_cast<int>(algorithm);
} }

16
src/wallet/fee_priority.h
View File

@ -31,7 +31,7 @@ namespace tools
inline constexpr EnumStringsType fee_priority_strings = { { "default", "unimportant", "normal", "elevated", "priority" } }; inline constexpr EnumStringsType fee_priority_strings = { { "default", "unimportant", "normal", "elevated", "priority" } };
inline constexpr EnumsType enums = { { fee_priority::Default, fee_priority::Unimportant, fee_priority::Normal, fee_priority::Elevated, fee_priority::Priority } }; inline constexpr EnumsType enums = { { fee_priority::Default, fee_priority::Unimportant, fee_priority::Normal, fee_priority::Elevated, fee_priority::Priority } };
static fee_priority decrease(const fee_priority priority) inline fee_priority decrease(const fee_priority priority)
{ {
if (priority == fee_priority::Default) if (priority == fee_priority::Default)
{ {
@ -45,12 +45,12 @@ namespace tools
} }
} }
static constexpr uint32_t as_integral(const fee_priority priority) inline constexpr uint32_t as_integral(const fee_priority priority)
{ {
return static_cast<uint32_t>(priority); return static_cast<uint32_t>(priority);
} }
static constexpr fee_priority from_integral(const uint32_t priority) inline constexpr fee_priority from_integral(const uint32_t priority)
{ {
if (priority >= as_integral(fee_priority::Priority)) if (priority >= as_integral(fee_priority::Priority))
{ {
@ -60,12 +60,12 @@ namespace tools
return static_cast<fee_priority>(priority); return static_cast<fee_priority>(priority);
} }
static bool is_valid(const uint32_t priority) inline bool is_valid(const uint32_t priority)
{ {
return priority <= as_integral(fee_priority::Priority); return priority <= as_integral(fee_priority::Priority);
} }
static fee_priority clamp(const fee_priority priority) inline fee_priority clamp(const fee_priority priority)
{ {
const auto highest = as_integral(fee_priority::Priority); const auto highest = as_integral(fee_priority::Priority);
const auto lowest = as_integral(fee_priority::Default); const auto lowest = as_integral(fee_priority::Default);
@ -85,7 +85,7 @@ namespace tools
} }
} }
static fee_priority clamp_modified(const fee_priority priority) inline fee_priority clamp_modified(const fee_priority priority)
{ {
/* Map Default to an actionable priority. */ /* Map Default to an actionable priority. */
if (priority == fee_priority::Default) if (priority == fee_priority::Default)
@ -98,13 +98,13 @@ namespace tools
} }
} }
static std::string_view to_string(const fee_priority priority) inline std::string_view to_string(const fee_priority priority)
{ {
const auto integralValue = as_integral(clamp(priority)); const auto integralValue = as_integral(clamp(priority));
return fee_priority_strings.at(integralValue); return fee_priority_strings.at(integralValue);
} }
static std::optional<fee_priority> from_string(const std::string& str) inline std::optional<fee_priority> from_string(const std::string& str)
{ {
const auto strIterator = std::find(fee_priority_strings.begin(), fee_priority_strings.end(), str); const auto strIterator = std::find(fee_priority_strings.begin(), fee_priority_strings.end(), str);
if (strIterator == fee_priority_strings.end()) if (strIterator == fee_priority_strings.end())