From 961e9b483c1499fe7e62b0e2c8e00b9034b2ef30 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Tue, 10 Jul 2018 17:18:11 -0400
Subject: [PATCH] Revert "Clear conversion warning"

This reverts commit 9748c3cf3edb5bb07f4930be77203ce4c5a8638f. It broke Windows.
---
 iterhash.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/iterhash.h b/iterhash.h
index ab55b1fc..45142f85 100644
--- a/iterhash.h
+++ b/iterhash.h
@@ -156,10 +156,7 @@ public:
 
 protected:
 	T_HashWordType* DataBuf() {return this->m_data;}
-
-	// Squash conversion warning
-	CRYPTOPP_CONSTANT(DCOUNT=T_BlockSize/sizeof(T_HashWordType))
-	FixedSizeSecBlock<T_HashWordType, DCOUNT> m_data;
+	FixedSizeSecBlock<T_HashWordType, T_BlockSize/sizeof(T_HashWordType)> m_data;
 };
 
 /// \brief Iterated hash with a static transformation function
@@ -189,11 +186,9 @@ protected:
 	IteratedHashWithStaticTransform() {this->Init();}
 	void HashEndianCorrectedBlock(const T_HashWordType *data) {T_Transform::Transform(this->m_state, data);}
 	void Init() {T_Transform::InitState(this->m_state);}
-	T_HashWordType* StateBuf() {return this->m_state;}
 
-	// Squash conversion warning
-	CRYPTOPP_CONSTANT(SCOUNT=T_BlockSize/sizeof(T_HashWordType))
-	FixedSizeSecBlock<T_HashWordType, SCOUNT> m_state;
+	T_HashWordType* StateBuf() {return this->m_state;}
+	FixedSizeAlignedSecBlock<T_HashWordType, T_BlockSize/sizeof(T_HashWordType), T_StateAligned> m_state;
 };
 
 #if !defined(__GNUC__) && !defined(__clang__)