mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-10 02:45:11 +00:00
4fa5971018
* patch-misc.h This fixes a warning triggered by testing an unsigned parameter against 0. The patch solves this by creating a different template for signed case. * patch-nbtheory.cpp This is a workaround for a bug with the current version of libc++ shipped with FreeBSD 9.x, which causes an infinite loop when generating RSA key, possibly also other operations. PR: ports/178827 Submitted by: Michael Gmelin <freebsd grem de>
55 lines
1.2 KiB
C++
55 lines
1.2 KiB
C++
--- misc.h.orig 2010-08-06 18:46:18.000000000 +0000
|
|
+++ misc.h 2013-05-22 08:43:01.949194748 +0000
|
|
@@ -405,17 +405,13 @@
|
|
return order == GetNativeByteOrder();
|
|
}
|
|
|
|
+template<bool> struct IsUnsigned {};
|
|
+
|
|
template <class T>
|
|
-std::string IntToString(T a, unsigned int base = 10)
|
|
+std::string IntToStringImpl(T a, unsigned int base, IsUnsigned<true>)
|
|
{
|
|
if (a == 0)
|
|
return "0";
|
|
- bool negate = false;
|
|
- if (a < 0)
|
|
- {
|
|
- negate = true;
|
|
- a = 0-a; // VC .NET does not like -a
|
|
- }
|
|
std::string result;
|
|
while (a > 0)
|
|
{
|
|
@@ -423,11 +419,30 @@
|
|
result = char((digit < 10 ? '0' : ('a' - 10)) + digit) + result;
|
|
a /= base;
|
|
}
|
|
+ return result;
|
|
+}
|
|
+
|
|
+template <class T>
|
|
+std::string IntToStringImpl(T a, unsigned int base, IsUnsigned<false>)
|
|
+{
|
|
+ bool negate = false;
|
|
+ if (a < 0)
|
|
+ {
|
|
+ negate = true;
|
|
+ a = 0-a; // VC .NET does not like -a
|
|
+ }
|
|
+ std::string result = IntToStringImpl(a, base, IsUnsigned<true>());
|
|
if (negate)
|
|
result = "-" + result;
|
|
return result;
|
|
}
|
|
|
|
+template <class T>
|
|
+std::string IntToString(T a, unsigned int base = 10)
|
|
+{
|
|
+ return IntToStringImpl(a, base, IsUnsigned<(static_cast<T>(-1) > 0)>());
|
|
+}
|
|
+
|
|
template <class T1, class T2>
|
|
inline T1 SaturatingSubtract(const T1 &a, const T2 &b)
|
|
{
|