commit 9f85468eb6acab173dd45a5e8d2c8a87e77923a7
author Jim King <jim.king@simplivity.com> Sun May 10 06:59:17 2015 -0400
committer Roger Meier <roger@apache.org> Sun May 10 14:42:42 2015 +0200
tree 20293b486d4db5c996ad36c5d52e5b413e3444e0
parent 9dfe7b83efff9e3b1aec0cdcdb7bfb869c40fbfa

THRIFT-1642 pull in patch from Jira to fix signedness issue in timeout calculation

This closes #485

lib/cpp/src/thrift/transport/TSocket.cpp

diff --git a/lib/cpp/src/thrift/transport/TSocket.cpp b/lib/cpp/src/thrift/transport/TSocket.cpp
index cc4dce0..4156d7e 100644
--- a/lib/cpp/src/thrift/transport/TSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSocket.cpp
@@ -564,7 +564,7 @@
       THRIFT_GETTIMEOFDAY(&end, NULL);
       uint32_t readElapsedMicros
           = static_cast<uint32_t>(((end.tv_sec - begin.tv_sec) * 1000 * 1000)
-                                  + (((uint64_t)(end.tv_usec - begin.tv_usec))));
+                                + (end.tv_usec - begin.tv_usec));
 
       if (!eagainThresholdMicros || (readElapsedMicros < eagainThresholdMicros)) {
         if (retries++ < maxRecvRetries_) {