From 42d92648b6a9e30263b961027dbcad7302f00387 Mon Sep 17 00:00:00 2001 From: weidai Date: Sat, 5 May 2007 19:03:05 +0000 Subject: [PATCH] fix VC 6 compile --- secblock.h | 4 +--- skipjack.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/secblock.h b/secblock.h index 6ba06567..4e082b84 100644 --- a/secblock.h +++ b/secblock.h @@ -71,11 +71,9 @@ typename A::pointer StandardReallocate(A& a, T *p, typename A::size_type oldSize if (preserve) { - A b; - typename A::pointer newPointer = b.allocate(newSize, NULL); + typename A::pointer newPointer = a.allocate(newSize, NULL); memcpy_s(newPointer, sizeof(T)*newSize, p, sizeof(T)*STDMIN(oldSize, newSize)); a.deallocate(p, oldSize); - std::swap(a, b); return newPointer; } else diff --git a/skipjack.cpp b/skipjack.cpp index 2405fab4..e9ec5866 100644 --- a/skipjack.cpp +++ b/skipjack.cpp @@ -100,7 +100,7 @@ typedef BlockGetAndPut Block; */ void SKIPJACK::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const { - word w1, w2, w3, w4; + word16 w1, w2, w3, w4; Block::Get(inBlock)(w4)(w3)(w2)(w1); /* stepping rule A: */ @@ -151,7 +151,7 @@ void SKIPJACK::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock */ void SKIPJACK::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const { - word w1, w2, w3, w4; + word16 w1, w2, w3, w4; Block::Get(inBlock)(w4)(w3)(w2)(w1); /* stepping rule A: */