diff options
author | weidai <weidai11@users.noreply.github.com> | 2006-04-06 21:20:25 +0000 |
---|---|---|
committer | weidai <weidai11@users.noreply.github.com> | 2006-04-06 21:20:25 +0000 |
commit | 6aacd0a0de141d218710374018412cca1893ad9d (patch) | |
tree | 34dba126863f587607debfecab883867f5f2d3dd /test.cpp | |
parent | 254b0f0d4d307221e0328b8f4e892a9bc0d93765 (diff) | |
download | cryptopp-git-6aacd0a0de141d218710374018412cca1893ad9d.tar.gz |
merge in changes by denis bider and fix compile on gcc 3.4.4 and MSVC 6
Diffstat (limited to 'test.cpp')
-rw-r--r-- | test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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); |