From 9b02f483ffe6f313ec86af3f29fa858fa0cb22e4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Feb 2012 14:04:46 -0500
Subject: [PATCH] VS2010 doesn't know how to compute min(4096, size_t) :-P
---
indra/llcommon/llprocess.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 55eb7e69d3c..d7c297b9523 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -144,8 +144,8 @@ class WritePipeImpl: public LLProcess::WritePipe
{
// Copy data out from mStreambuf to a flat, contiguous buffer to
// write -- but only up to a certain size.
- std::streamsize total(mStreambuf.size());
- std::streamsize bufsize((std::min)(4096, total));
+ std::size_t total(mStreambuf.size());
+ std::size_t bufsize((std::min)(std::size_t(4096), total));
boost::asio::streambuf::const_buffers_type bufs = mStreambuf.data();
std::vector<char> buffer(
boost::asio::buffers_begin(bufs),
@@ -241,7 +241,7 @@ class ReadPipeImpl: public LLProcess::ReadPipe
// Now that we've received new data, publish it on our
// LLEventPump as advertised. Constrain it by mLimit.
- std::streamsize datasize((std::min)(mLimit, mStreambuf.size()));
+ std::size_t datasize((std::min)(mLimit, mStreambuf.size()));
boost::asio::streambuf::const_buffers_type cbufs = mStreambuf.data();
mPump.post(LLSDMap("data", LLSD::String(
boost::asio::buffers_begin(cbufs),
--
GitLab