summaryrefslogtreecommitdiff
path: root/lib/cpp/src
diff options
context:
space:
mode:
authorJens Geyer <jensg@apache.org>2014-07-27 19:19:31 +0200
committerJens Geyer <jensg@apache.org>2014-07-27 19:19:31 +0200
commit5c0e987ac10ef4c16fdca68397dc380e5d8466b3 (patch)
treefed1c948c3787773a20e25f9e02d977f72f8a2f8 /lib/cpp/src
parent557d6ea410c03a4cfb126e2031b605f8692c2a6a (diff)
downloadthrift-5c0e987ac10ef4c16fdca68397dc380e5d8466b3.tar.gz
THRIFT-2541 fixed C4003 with VC2012 around max()
Client: C++ Patch: Jens Geyer
Diffstat (limited to 'lib/cpp/src')
-rw-r--r--lib/cpp/src/thrift/transport/TBufferTransports.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/cpp/src/thrift/transport/TBufferTransports.h b/lib/cpp/src/thrift/transport/TBufferTransports.h
index 5c17d03a1..b669a5968 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)