From 59a9b0ef260b010606edc3384035b6aa12dd6415 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Tue, 14 Sep 2010 01:31:38 +0000
Subject: Handle the case that container size() returns something other than
 u32bit

---
 src/block/rc6/rc6.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/block/rc6')

diff --git a/src/block/rc6/rc6.cpp b/src/block/rc6/rc6.cpp
index 5f88d1d0b..291d3b97e 100644
--- a/src/block/rc6/rc6.cpp
+++ b/src/block/rc6/rc6.cpp
@@ -114,7 +114,7 @@ void RC6::decrypt_n(const byte in[], byte out[], u32bit blocks) const
 void RC6::key_schedule(const byte key[], u32bit length)
    {
    const u32bit WORD_KEYLENGTH = (((length - 1) / 4) + 1),
-                MIX_ROUNDS     = 3*std::max(WORD_KEYLENGTH, S.size());
+                MIX_ROUNDS     = 3*std::max<u32bit>(WORD_KEYLENGTH, S.size());
    S[0] = 0xB7E15163;
    for(u32bit j = 1; j != S.size(); ++j)
       S[j] = S[j-1] + 0x9E3779B9;
-- 
cgit v1.2.3