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

remove warning with MSVC .NET 2005

pull/2/head
weidai 2005-09-03 15:35:29 +00:00
parent 405815edbe
commit 893174431d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc.h
View File

@ -363,37 +363,37 @@ inline void IncrementCounterByOne(byte *output, const byte *input, unsigned int
template <class T> inline T rotlFixed(T x, unsigned int y) template <class T> inline T rotlFixed(T x, unsigned int y)
{ {
assert(y < sizeof(T)*8); assert(y < sizeof(T)*8);
return (x<<y) | (x>>(sizeof(T)*8-y)); return T((x<<y) | (x>>(sizeof(T)*8-y)));
} }
template <class T> inline T rotrFixed(T x, unsigned int y) template <class T> inline T rotrFixed(T x, unsigned int y)
{ {
assert(y < sizeof(T)*8); assert(y < sizeof(T)*8);
return (x>>y) | (x<<(sizeof(T)*8-y)); return T((x>>y) | (x<<(sizeof(T)*8-y)));
} }
template <class T> inline T rotlVariable(T x, unsigned int y) template <class T> inline T rotlVariable(T x, unsigned int y)
{ {
assert(y < sizeof(T)*8); assert(y < sizeof(T)*8);
return (x<<y) | (x>>(sizeof(T)*8-y)); return T((x<<y) | (x>>(sizeof(T)*8-y)));
} }
template <class T> inline T rotrVariable(T x, unsigned int y) template <class T> inline T rotrVariable(T x, unsigned int y)
{ {
assert(y < sizeof(T)*8); assert(y < sizeof(T)*8);
return (x>>y) | (x<<(sizeof(T)*8-y)); return T((x>>y) | (x<<(sizeof(T)*8-y)));
} }
template <class T> inline T rotlMod(T x, unsigned int y) template <class T> inline T rotlMod(T x, unsigned int y)
{ {
y %= sizeof(T)*8; y %= sizeof(T)*8;
return (x<<y) | (x>>(sizeof(T)*8-y)); return T((x<<y) | (x>>(sizeof(T)*8-y)));
} }
template <class T> inline T rotrMod(T x, unsigned int y) template <class T> inline T rotrMod(T x, unsigned int y)
{ {
y %= sizeof(T)*8; y %= sizeof(T)*8;
return (x>>y) | (x<<(sizeof(T)*8-y)); return T((x>>y) | (x<<(sizeof(T)*8-y)));
} }
#ifdef INTEL_INTRINSICS #ifdef INTEL_INTRINSICS