Removed VC++ 5.0 and 6.0 workarounds (Issue 342)

1 files changed, 1 insertions, 10 deletions

diff --git a/vmac.cpp b/vmac.cpp
index d482cc7c..c50f9958 100644
--- a/vmac.cpp
+++ b/vmac.cpp
@@ -196,7 +196,7 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64,
 	AS2(	mov		%1, %%ebx)

 	INTEL_NOPREFIX

 #else

-	#if _MSC_VER < 1300 || defined(__INTEL_COMPILER)

+	#if defined(__INTEL_COMPILER)

 	char isFirstBlock = m_isFirstBlock;

 	AS2(	mov		ebx, [L1KeyLength])

 	AS2(	mov		dl, [isFirstBlock])

@@ -540,9 +540,7 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64,
 		}

 #endif

 

-#if !(defined(_MSC_VER) && _MSC_VER < 1300)

 template <bool T_128BitTag>

-#endif

 void VMAC_Base::VHASH_Update_Template(const word64 *data, size_t blocksRemainingInWord64)

 {

 	CRYPTOPP_ASSERT(IsAlignedOn(m_polyState(),GetAlignmentOf<word64>()));

@@ -556,9 +554,6 @@ void VMAC_Base::VHASH_Update_Template(const word64 *data, size_t blocksRemaining
 			AccumulateNH(nhB, d0+nhK[i+2*j+2], d1+nhK[i+2*j+3]);\

 		}

 

-#if (defined(_MSC_VER) && _MSC_VER < 1300)

-	bool T_128BitTag = m_is128;

-#endif

 	size_t L1KeyLengthInWord64 = m_L1KeyLength / 8;

 	size_t innerLoopEnd = L1KeyLengthInWord64;

 	const word64 *nhK = m_nhKey();

@@ -816,14 +811,10 @@ inline void VMAC_Base::VHASH_Update(const word64 *data, size_t blocksRemainingIn
 	else

 #endif

 	{

-#if defined(_MSC_VER) && _MSC_VER < 1300

-		VHASH_Update_Template(data, blocksRemainingInWord64);

-#else

 		if (m_is128)

 			VHASH_Update_Template<true>(data, blocksRemainingInWord64);

 		else

 			VHASH_Update_Template<false>(data, blocksRemainingInWord64);

-#endif

 	}

 }