Clear unreachable code warnings under VC++

1 files changed, 8 insertions, 4 deletions

diff --git a/fips140.cpp b/fips140.cpp
index bbccde55..4e137443 100644
--- a/fips140.cpp
+++ b/fips140.cpp
@@ -47,31 +47,35 @@ bool PowerUpSelfTestInProgressOnThisThread()
 {

 #if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2

 	return s_inProgress;

-#endif

+#else

 	return false;

+#endif

 }

 

 void SetPowerUpSelfTestInProgressOnThisThread(bool inProgress)

 {

-	CRYPTOPP_UNUSED(inProgress);

 #if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2

 	s_inProgress = inProgress;

+#else

+	CRYPTOPP_UNUSED(inProgress);

 #endif

 }

 

 void EncryptionPairwiseConsistencyTest_FIPS_140_Only(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor)

 {

-	CRYPTOPP_UNUSED(encryptor), CRYPTOPP_UNUSED(decryptor);

 #if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2

 	EncryptionPairwiseConsistencyTest(encryptor, decryptor);

+#else

+	CRYPTOPP_UNUSED(encryptor), CRYPTOPP_UNUSED(decryptor);

 #endif

 }

 

 void SignaturePairwiseConsistencyTest_FIPS_140_Only(const PK_Signer &signer, const PK_Verifier &verifier)

 {

-	CRYPTOPP_UNUSED(signer), CRYPTOPP_UNUSED(verifier);

 #if CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2

 	SignaturePairwiseConsistencyTest(signer, verifier);

+#else

+	CRYPTOPP_UNUSED(signer), CRYPTOPP_UNUSED(verifier);

 #endif

 }