Cleanup Windows build after refactoring

4 files changed, 5 insertions, 7 deletions

diff --git a/dll.cpp b/dll.cpp
index afd863c8..37a4c87c 100644
--- a/dll.cpp
+++ b/dll.cpp
@@ -66,8 +66,6 @@ NAMESPACE_END
 

 USING_NAMESPACE(CryptoPP)

 

-using set_new_handler;

-

 static PNew s_pNew = NULLPTR;

 static PDelete s_pDelete = NULLPTR;

 

@@ -111,7 +109,7 @@ static void SetNewAndDeleteFunctionPointers()
 		{

 			s_pNew = &New;

 			s_pDelete = &free;

-			pSetNewAndDelete(s_pNew, s_pDelete, &set_new_handler);

+			pSetNewAndDelete(s_pNew, s_pDelete, &std::set_new_handler);

 			return;

 		}

 	}

diff --git a/stdcpp.h b/stdcpp.h
index 592b5f39..8bda2904 100644
--- a/stdcpp.h
+++ b/stdcpp.h
@@ -95,7 +95,7 @@ namespace std {
 // C++Builder's standard library (Dinkumware) do not have C's global log() function

 // https://github.com/weidai11/cryptopp/issues/520

 #ifdef __BORLANDC__

-using log;

+using std::log;

 #endif

 

 #endif  // CRYPTOPP_STDCPP_H

diff --git a/validat0.cpp b/validat0.cpp
index f0a99c65..15714353 100644
--- a/validat0.cpp
+++ b/validat0.cpp
@@ -1556,7 +1556,7 @@ bool TestASN1Functions()
 

         len = DEREncodeOctetString(encoded, ConstBytePtr(message), BytePtrSize(message));

         DERReencode(encoded, reencoded);

-        rlen = reencoded.MaxRetrievable();

+        rlen = (size_t)reencoded.MaxRetrievable();

         (void)BERDecodeOctetString(reencoded, decoded);

 

         std::string recovered;

@@ -1589,7 +1589,7 @@ bool TestASN1Functions()
 

             len = DEREncodeTextString(encoded, ConstBytePtr(message), BytePtrSize(message), asnStringTypes[i]);

             DERReencode(encoded, reencoded);

-            rlen = reencoded.MaxRetrievable();

+            rlen = (size_t)reencoded.MaxRetrievable();

             (void)BERDecodeTextString(reencoded, recovered, asnStringTypes[i]);

 

             fail = (len != rlen || message != recovered);

diff --git a/validat8.cpp b/validat8.cpp
index 7e6f64b2..d7772e6e 100644
--- a/validat8.cpp
+++ b/validat8.cpp
@@ -158,7 +158,7 @@ bool ValidateRSA_Encrypt()
 		rsaPriv.DEREncodePrivateKey(q);

 

 		RSA::PrivateKey rsaPriv2;

-		rsaPriv2.BERDecodePrivateKey(q, true, q.MaxRetrievable());

+		rsaPriv2.BERDecodePrivateKey(q, true, (size_t)q.MaxRetrievable());

 

 		fail = (rsaPriv != rsaPriv2);

 		pass = pass && !fail;