merge in changes by denis bider and fix compile on gcc 3.4.4 and MSVC 6

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@219 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 3 insertions, 3 deletions

diff --git a/test.cpp b/test.cpp
index e5ef22c..6ac7f4b 100644
--- a/test.cpp
+++ b/test.cpp
@@ -192,7 +192,7 @@ int __cdecl main(int argc, char *argv[])
 				return 1;
 			}
 
-			unsigned int macPos = unsigned int(found-buf.begin());
+			unsigned int macPos = (unsigned int)(found-buf.begin());
 			member_ptr<MessageAuthenticationCode> pMac(NewIntegrityCheckingMAC());
 			pMac->Update(buf.begin(), macPos);
 			pMac->Update(buf.begin() + macPos + sizeof(dummyMac), fileSize - sizeof(dummyMac) - macPos);
@@ -683,8 +683,8 @@ void ForwardTcpPort(const char *sourcePortName, const char *destinationHost, con
 	{
 		waitObjects.Clear();
 
-		out.GetWaitObjects(waitObjects);
-		in.GetWaitObjects(waitObjects);
+		out.GetWaitObjects(waitObjects, CallStack("ForwardTcpPort - out", NULL));
+		in.GetWaitObjects(waitObjects, CallStack("ForwardTcpPort - in", NULL));
 
 		waitObjects.Wait(INFINITE_TIME);