summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2005-09-03 15:35:29 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2005-09-03 15:35:29 +0000
commitf7512720fcc78a6468e4f5db75e95f63b87c0b03 (patch)
tree2a2c83c35c16eda9fce361e985a16e8d82c4c7bc /misc.h
parentbb221d876e4a238103549bfd8d4b7587143585e8 (diff)
downloadcryptopp-f7512720fcc78a6468e4f5db75e95f63b87c0b03.tar.gz
remove warning with MSVC .NET 2005
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@208 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'misc.h')
-rw-r--r--misc.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/misc.h b/misc.h
index e8c3eaa..ba77ac4 100644
--- a/misc.h
+++ b/misc.h
@@ -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)
{
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)
{
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)
{
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)
{
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)
{
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)
{
y %= sizeof(T)*8;
- return (x>>y) | (x<<(sizeof(T)*8-y));
+ return T((x>>y) | (x<<(sizeof(T)*8-y)));
}
#ifdef INTEL_INTRINSICS