1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
This fixes a warning triggered by testing an unsigned parameter
against 0. The patch solves this by creating a different template
for signed case. (PR: 178827)
--- misc.h.orig 2021-01-01 17:03:59 UTC
+++ misc.h
@@ -700,8 +700,10 @@ inline bool SafeConvert(T1 from, T2 &to)
/// \param value the value to convert
/// \param base the base to use during the conversion
/// \return the string representation of value in base.
+template<bool> struct IsUnsigned {};
+
template <class T>
-std::string IntToString(T value, unsigned int base = 10)
+std::string IntToStringImpl(T value, unsigned int base, IsUnsigned<true>)
{
// Hack... set the high bit for uppercase.
const unsigned int HIGH_BIT = (1U << 31);
@@ -712,12 +714,6 @@ std::string IntToString(T value, unsigned int base = 1
if (value == 0)
return "0";
- bool negate = false;
- if (value < 0)
- {
- negate = true;
- value = 0-value; // VC .NET does not like -a
- }
std::string result;
while (value > 0)
{
@@ -725,9 +721,28 @@ std::string IntToString(T value, unsigned int base = 1
result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result;
value /= base;
}
+ return result;
+}
+
+template <class T>
+std::string IntToStringImpl(T value, unsigned int base, IsUnsigned<false>)
+{
+ bool negate = false;
+ if (value < 0)
+ {
+ negate = true;
+ value = 0-value; // VC .NET does not like -a
+ }
+ std::string result = IntToStringImpl(value, base, IsUnsigned<true>());
if (negate)
result = "-" + result;
return result;
+}
+
+template <class T>
+std::string IntToString(T value, unsigned int base = 10)
+{
+ return IntToStringImpl(value, base, IsUnsigned<(static_cast<T>(-1) > 0)>());
}
/// \brief Converts an unsigned value to a string
|
