arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes the warning on IntToString about comparison of unsigned and signed values, when boost::uint32_t and boost::uint64_t are used with the function

pull/35/head
Alberto Curro 2015-10-01 14:35:45 +01:00
parent aff5105569
commit 1d5bcc08fb
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc.h
View File

@ -6,6 +6,8 @@
#include "stdcpp.h" #include "stdcpp.h"
#include "trap.h" #include "trap.h"
#include <limits>
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400
// VC2005 workaround: disable declarations that conflict with winnt.h // VC2005 workaround: disable declarations that conflict with winnt.h
@ -71,6 +73,16 @@ struct CompileAssert
static char dummy[2*b-1]; static char dummy[2*b-1];
}; };
// Checks signed input to be negative or positive.
template < typename T, bool sig> struct negative{
bool operator()(const T &x){ return x < 0; }
};
// Unsigned input won't be checked, this avoids the compiler warning when unsigned int (or long unsigned int) is used.
template < typename T> struct negative<T,false>{
bool operator()(const T &x){ return false; }
};
// __attribute__ ((unused)) will help silence the "unused variable warnings. Its available // __attribute__ ((unused)) will help silence the "unused variable warnings. Its available
// at least as early as GCC 2.9.3 (https://gcc.gnu.org/onlinedocs/gcc-2.95.3/gcc_4.html#SEC84) // at least as early as GCC 2.9.3 (https://gcc.gnu.org/onlinedocs/gcc-2.95.3/gcc_4.html#SEC84)
// This also works into our -Wall -Wextra strategy for warnings. // This also works into our -Wall -Wextra strategy for warnings.
@ -532,8 +544,7 @@ std::string IntToString(T a, unsigned int base = 10)
if (a == 0) if (a == 0)
return "0"; return "0";
bool negate = false; bool negate = false;
if (a < 0) if (negative<T, std::numeric_limits<T>::is_signed>()(a)) {
{
negate = true; negate = true;
a = 0-a; // VC .NET does not like -a a = 0-a; // VC .NET does not like -a
} }