You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/07/27 19:21:19 UTC
git commit: THRIFT-2541 fixed C4003 with VC2012 around max() Client:
C++ Patch: Jens Geyer
Repository: thrift
Updated Branches:
refs/heads/master 557d6ea41 -> 5c0e987ac
THRIFT-2541 fixed C4003 with VC2012 around max()
Client: C++
Patch: Jens Geyer
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5c0e987a
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5c0e987a
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5c0e987a
Branch: refs/heads/master
Commit: 5c0e987ac10ef4c16fdca68397dc380e5d8466b3
Parents: 557d6ea
Author: Jens Geyer <je...@apache.org>
Authored: Sun Jul 27 19:19:31 2014 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Sun Jul 27 19:19:31 2014 +0200
----------------------------------------------------------------------
lib/cpp/src/thrift/transport/TBufferTransports.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/5c0e987a/lib/cpp/src/thrift/transport/TBufferTransports.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TBufferTransports.h b/lib/cpp/src/thrift/transport/TBufferTransports.h
index 5c17d03..b669a59 100644
--- a/lib/cpp/src/thrift/transport/TBufferTransports.h
+++ b/lib/cpp/src/thrift/transport/TBufferTransports.h
@@ -335,13 +335,13 @@ class TFramedTransport
, wBufSize_(DEFAULT_BUFFER_SIZE)
, rBuf_()
, wBuf_(new uint8_t[wBufSize_])
- , bufReclaimThresh_(std::numeric_limits<uint32_t>::max())
+ , bufReclaimThresh_((std::numeric_limits<uint32_t>::max)())
{
initPointers();
}
TFramedTransport(boost::shared_ptr<TTransport> transport, uint32_t sz,
- uint32_t bufReclaimThresh = std::numeric_limits<uint32_t>::max())
+ uint32_t bufReclaimThresh = (std::numeric_limits<uint32_t>::max)())
: transport_(transport)
, rBufSize_(0)
, wBufSize_(sz)