mirror of
https://github.com/pocoproject/poco.git
synced 2025-12-09 16:36:51 +01:00
fix(NumberFormatter): Add HEX_ to number formatting options to avoid name conflicts with other libraries.
This commit is contained in:
@@ -48,9 +48,9 @@ public:
|
||||
{
|
||||
DEFAULT = 0,
|
||||
/// formatHex defaults: No 0x prefix, uppercase hexadecimal values
|
||||
PREFIX = 1 << 0,
|
||||
HEX_PREFIX = (1 << 0),
|
||||
/// formatHex: Prepend prefix 0x
|
||||
LOWERCASE = 1 << 1
|
||||
HEX_LOWERCASE = (1 << 1)
|
||||
/// formatHex: Use lowercase letters for hexadecimal values
|
||||
};
|
||||
|
||||
@@ -750,7 +750,7 @@ inline std::string NumberFormatter::format0(unsigned int value, int width)
|
||||
inline std::string NumberFormatter::formatHex(unsigned value, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX),-1, ' ', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), -1, ' ', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -758,7 +758,7 @@ inline std::string NumberFormatter::formatHex(unsigned value, Options options)
|
||||
inline std::string NumberFormatter::formatHex(unsigned value, int width, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX), width, '0', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), width, '0', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -826,7 +826,7 @@ inline std::string NumberFormatter::format0(unsigned long value, int width)
|
||||
inline std::string NumberFormatter::formatHex(unsigned long value, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX), -1, ' ', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), -1, ' ', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -834,7 +834,7 @@ inline std::string NumberFormatter::formatHex(unsigned long value, Options optio
|
||||
inline std::string NumberFormatter::formatHex(unsigned long value, int width, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX), width, '0', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), width, '0', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -905,7 +905,7 @@ inline std::string NumberFormatter::format0(unsigned long long value, int width)
|
||||
inline std::string NumberFormatter::formatHex(unsigned long long value, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX), -1, ' ', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), -1, ' ', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -913,7 +913,7 @@ inline std::string NumberFormatter::formatHex(unsigned long long value, Options
|
||||
inline std::string NumberFormatter::formatHex(unsigned long long value, int width, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX), width, '0', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), width, '0', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -984,7 +984,7 @@ inline std::string NumberFormatter::format0(UInt64 value, int width)
|
||||
inline std::string NumberFormatter::formatHex(UInt64 value, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX), -1, ' ', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), -1, ' ', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -992,7 +992,7 @@ inline std::string NumberFormatter::formatHex(UInt64 value, Options options)
|
||||
inline std::string NumberFormatter::formatHex(UInt64 value, int width, Options options)
|
||||
{
|
||||
std::string result;
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::PREFIX), width, '0', 0, isEnabled(options, Options::LOWERCASE));
|
||||
intToStr(value, 0x10, result, isEnabled(options, Options::HEX_PREFIX), width, '0', 0, isEnabled(options, Options::HEX_LOWERCASE));
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -117,59 +117,59 @@ void NumberFormatterTest::testFormatHex()
|
||||
|
||||
assertTrue (NumberFormatter::formatHex(0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex(0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex(0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 4) == "00AB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 4, Opt::LOWERCASE) == "00ab");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 4, Opt::HEX_LOWERCASE) == "00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 4) == "00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 4, Opt::LOWERCASE) == "00ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 4, Opt::HEX_LOWERCASE) == "00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 4) == "00AB");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 4) == "00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 4, Opt::LOWERCASE) == "00ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 4, Opt::HEX_LOWERCASE) == "00ab");
|
||||
|
||||
#if defined(POCO_HAVE_INT64)
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 4) == "00AB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 4, Opt::LOWERCASE) == "00ab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 4, Opt::HEX_LOWERCASE) == "00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 4) == "00AB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 4, Opt::LOWERCASE) == "00ab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 4, Opt::HEX_LOWERCASE) == "00ab");
|
||||
#if defined(POCO_LONG_IS_64_BIT)
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 4) == "00AB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 4, Opt::LOWERCASE) == "00ab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 4, Opt::HEX_LOWERCASE) == "00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12) == "12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab) == "AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, Opt::LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, Opt::HEX_LOWERCASE) == "ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, 4) == "0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 4) == "00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 4, Opt::LOWERCASE) == "00ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 4, Opt::HEX_LOWERCASE) == "00ab");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -185,86 +185,86 @@ void NumberFormatterTest::testFormatHex()
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, true) == "0x12");
|
||||
#endif
|
||||
|
||||
assertTrue (NumberFormatter::formatHex(0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex(0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex(0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex(0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex(0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex(0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex(0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned) 0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((long) 0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long) 0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
|
||||
#if defined(POCO_HAVE_INT64)
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((Int64) 0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((UInt64) 0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
#if defined(POCO_LONG_IS_64_BIT)
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((long long) 0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, 4, Opt::PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 4, Opt::PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 4, Opt::PREFIX | Opt::LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, 6, Opt::PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 6, Opt::PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 6, Opt::PREFIX | Opt::LOWERCASE) == "0x00ab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, 4, Opt::HEX_PREFIX) == "0x12");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 4, Opt::HEX_PREFIX) == "0xAB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 4, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0xab");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0x12, 6, Opt::HEX_PREFIX) == "0x0012");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 6, Opt::HEX_PREFIX) == "0x00AB");
|
||||
assertTrue (NumberFormatter::formatHex((unsigned long long) 0xab, 6, Opt::HEX_PREFIX | Opt::HEX_LOWERCASE) == "0x00ab");
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user