generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-12-11 02:25:59 +01:00
Code Issues Projects Releases Wiki Activity

fix(NumberFormatter): Add HEX_ to number formatting options to avoid name conflicts with other libraries.

Browse Source
This commit is contained in:
Matej Kenda
2025-09-11 10:37:25 +02:00
parent d16161322e
commit 41f045c271
3 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Foundation/src/NumberFormatter.cpp
View File

@@ -492,49 +492,49 @@ void NumberFormatter::append(std::string& str, const void* ptr)
std::string NumberFormatter::formatHex(int value, bool prefix)
{
return formatHex(static_cast<unsigned int>(value), prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<unsigned int>(value), prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(int value, int width, bool prefix)
{
return formatHex(static_cast<unsigned int>(value), width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<unsigned int>(value), width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(unsigned value, bool prefix)
{
return formatHex(value, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(unsigned value, int width, bool prefix)
{
return formatHex(value, width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(long value, bool prefix)
{
return formatHex(static_cast<unsigned long>(value), prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<unsigned long>(value), prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(long value, int width, bool prefix)
{
return formatHex(static_cast<unsigned long>(value), width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<unsigned long>(value), width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(unsigned long value, bool prefix)
{
return formatHex(value, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(unsigned long value, int width, bool prefix)
{
return formatHex(value, width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
@@ -544,25 +544,25 @@ std::string NumberFormatter::formatHex(unsigned long value, int width, bool pref
std::string NumberFormatter::formatHex(long long value, bool prefix)
{
return formatHex(static_cast<unsigned long long>(value), prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<unsigned long long>(value), prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(long long value, int width, bool prefix)
{
return formatHex(static_cast<unsigned long long>(value), width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<unsigned long long>(value), width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(unsigned long long value, bool prefix)
{
return formatHex(value, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(unsigned long long value, int width, bool prefix)
{
return formatHex(value, width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
@@ -571,25 +571,25 @@ std::string NumberFormatter::formatHex(unsigned long long value, int width, bool
std::string NumberFormatter::formatHex(Int64 value, bool prefix)
{
return formatHex(static_cast<UInt64>(value), prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<UInt64>(value), prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(Int64 value, int width, bool prefix)
{
return formatHex(static_cast<UInt64>(value), width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(static_cast<UInt64>(value), width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(UInt64 value, bool prefix)
{
return formatHex(value, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}
std::string NumberFormatter::formatHex(UInt64 value, int width, bool prefix)
{
return formatHex(value, width, prefix ? Options::PREFIX : Options::DEFAULT);
return formatHex(value, width, prefix ? Options::HEX_PREFIX : Options::DEFAULT);
}