mirror of
https://git.freebsd.org/ports.git
synced 2025-05-28 08:56:28 -04:00
edf512ca2e
We now install a pkgconfig file which will allow ports to check whether cryptopp was built with assembly instructions enabled or not. There are a few functions that will be undefined if built without assembly and -DCRYPTOPP_DISABLE_ASM needs to be passed to the compiler in that case to avoid build failures. This is not new, but the pkgconf file should make it easier to determine if the flag is needed or not. Fix several ports due to API changes and to use the new pkgconf file to determine cryptopp location and build flags. Special cases below. deskutils/cdcat - Use cryptopp shared library instead of static, detect with pkgconf devel/xeus - Fix dependencies and remove header-only libraries from RUN_DEPENDS - Rework to use the cryptopp pkgconf file - net/cppzmq CMake files were fixed in r477649, remove hacks for that as they were seemingly causing devel/xeus-cling to link to cryptopp unnecessarily - Remove C++17 code from cryptopp checks for compatibility devel/xeus-cling - Fix dependencies - Remove hacks for previously broken cppzmq CMake files and no longer needed cryptopp dependency Changes: https://www.cryptopp.com/#news PR: 230579 (original patch, not used) Submitted by: yuri
60 lines
1.7 KiB
C++
60 lines
1.7 KiB
C++
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 2018-04-08 08:47:11 UTC
|
|
+++ misc.h
|
|
@@ -572,8 +572,10 @@ inline bool SafeConvert(T1 from, T2 &to)
|
|
/// \param value the value to convert
|
|
/// \param base the base to use during the conversion
|
|
/// \returns 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.
|
|
static const unsigned int HIGH_BIT = (1U << 31);
|
|
@@ -584,12 +586,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)
|
|
{
|
|
@@ -597,9 +593,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
|